diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/LoadingDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/LoadingDialog.java index dc36ef896..6f1d8f798 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/LoadingDialog.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/LoadingDialog.java @@ -1,8 +1,11 @@ package com.yizhuan.erban.ui.widget; import android.content.Context; +import android.graphics.drawable.AnimationDrawable; import android.os.Bundle; + import androidx.appcompat.app.AppCompatDialog; + import android.view.animation.Animation; import android.view.animation.AnimationUtils; import android.widget.ImageView; @@ -29,9 +32,7 @@ public class LoadingDialog extends AppCompatDialog { setContentView(R.layout.dialog_loading); setCancelable(false); setCanceledOnTouchOutside(false); - ivLoading = (ImageView) findViewById(R.id.iv_loading); - Animation animation = AnimationUtils.loadAnimation(context, R.anim.comm_loading); - ivLoading.setAnimation(animation); - animation.start(); + ivLoading = findViewById(R.id.iv_loading); + ((AnimationDrawable) ivLoading.getDrawable()).start(); } } diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoDialog.java index 994da0bfc..3f76cfed8 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoDialog.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoDialog.java @@ -193,7 +193,8 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe boolean isNeedGiftItem, boolean isNeedRoomItem, GiftDialog.OnGiftDialogBtnClickListener listener) { - CommonLoadingDialog loadingDialog = new CommonLoadingDialog(context, "loading...").showDialog(); + LoadingDialog loadingDialog = new LoadingDialog(context); + loadingDialog.show(); UserModel.get().getUserInfo(uid) .compose(RxHelper.bindContext(context)) .subscribe(userInfo -> { diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/CommonLoadingDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/CommonLoadingDialog.java index 158557788..60eb8b15c 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/CommonLoadingDialog.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/CommonLoadingDialog.java @@ -1,8 +1,10 @@ package com.yizhuan.erban.ui.widget.dialog; import android.content.Context; +import android.graphics.drawable.AnimationDrawable; import android.os.Bundle; import android.view.Window; +import android.widget.ImageView; import android.widget.ProgressBar; import android.widget.TextView; @@ -18,6 +20,7 @@ public class CommonLoadingDialog extends BaseDialog { private String msg = "加载中..."; private TextView tvTip; + private ImageView ivLoading; public CommonLoadingDialog(Context context, String tip) { super(context, R.style.dialog); @@ -34,6 +37,8 @@ public class CommonLoadingDialog extends BaseDialog { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.layout_progress_dialog); + ivLoading = findViewById(R.id.iv_loading); + ((AnimationDrawable) ivLoading.getDrawable()).start(); tvTip = (TextView) findViewById(R.id.tv_tip); tvTip.setText(msg); } diff --git a/app/src/main/res/drawable-xhdpi/loading_000.png b/app/src/main/res/drawable-xhdpi/loading_000.png new file mode 100644 index 000000000..96d6c6d50 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/loading_000.png differ diff --git a/app/src/main/res/drawable-xhdpi/loading_001.png b/app/src/main/res/drawable-xhdpi/loading_001.png new file mode 100644 index 000000000..4108d9c65 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/loading_001.png differ diff --git a/app/src/main/res/drawable-xhdpi/loading_002.png b/app/src/main/res/drawable-xhdpi/loading_002.png new file mode 100644 index 000000000..7dd28ef23 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/loading_002.png differ diff --git a/app/src/main/res/drawable-xhdpi/loading_003.png b/app/src/main/res/drawable-xhdpi/loading_003.png new file mode 100644 index 000000000..0b73200f9 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/loading_003.png differ diff --git a/app/src/main/res/drawable-xhdpi/loading_004.png b/app/src/main/res/drawable-xhdpi/loading_004.png new file mode 100644 index 000000000..2421996e5 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/loading_004.png differ diff --git a/app/src/main/res/drawable-xhdpi/loading_005.png b/app/src/main/res/drawable-xhdpi/loading_005.png new file mode 100644 index 000000000..b2434e1a8 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/loading_005.png differ diff --git a/app/src/main/res/drawable-xhdpi/loading_006.png b/app/src/main/res/drawable-xhdpi/loading_006.png new file mode 100644 index 000000000..dccc4ba76 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/loading_006.png differ diff --git a/app/src/main/res/drawable-xhdpi/loading_007.png b/app/src/main/res/drawable-xhdpi/loading_007.png new file mode 100644 index 000000000..ef750d7bb Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/loading_007.png differ diff --git a/app/src/main/res/drawable-xhdpi/loading_008.png b/app/src/main/res/drawable-xhdpi/loading_008.png new file mode 100644 index 000000000..bf6f5f0eb Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/loading_008.png differ diff --git a/app/src/main/res/drawable-xhdpi/loading_009.png b/app/src/main/res/drawable-xhdpi/loading_009.png new file mode 100644 index 000000000..1ebbd7cab Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/loading_009.png differ diff --git a/app/src/main/res/drawable-xhdpi/loading_010.png b/app/src/main/res/drawable-xhdpi/loading_010.png new file mode 100644 index 000000000..edf03eb24 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/loading_010.png differ diff --git a/app/src/main/res/drawable-xhdpi/loading_011.png b/app/src/main/res/drawable-xhdpi/loading_011.png new file mode 100644 index 000000000..c3c3b529b Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/loading_011.png differ diff --git a/app/src/main/res/drawable-xhdpi/loading_012.png b/app/src/main/res/drawable-xhdpi/loading_012.png new file mode 100644 index 000000000..271a22b63 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/loading_012.png differ diff --git a/app/src/main/res/drawable-xhdpi/loading_013.png b/app/src/main/res/drawable-xhdpi/loading_013.png new file mode 100644 index 000000000..e8f100bd9 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/loading_013.png differ diff --git a/app/src/main/res/drawable-xhdpi/loading_014.png b/app/src/main/res/drawable-xhdpi/loading_014.png new file mode 100644 index 000000000..5f951df1e Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/loading_014.png differ diff --git a/app/src/main/res/drawable-xhdpi/loading_015.png b/app/src/main/res/drawable-xhdpi/loading_015.png new file mode 100644 index 000000000..0a72ff26e Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/loading_015.png differ diff --git a/app/src/main/res/drawable-xhdpi/loading_016.png b/app/src/main/res/drawable-xhdpi/loading_016.png new file mode 100644 index 000000000..b80a3d2b4 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/loading_016.png differ diff --git a/app/src/main/res/drawable-xhdpi/loading_017.png b/app/src/main/res/drawable-xhdpi/loading_017.png new file mode 100644 index 000000000..46c063d79 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/loading_017.png differ diff --git a/app/src/main/res/drawable-xhdpi/loading_018.png b/app/src/main/res/drawable-xhdpi/loading_018.png new file mode 100644 index 000000000..3ae09ccaf Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/loading_018.png differ diff --git a/app/src/main/res/drawable-xhdpi/loading_019.png b/app/src/main/res/drawable-xhdpi/loading_019.png new file mode 100644 index 000000000..716b6e3d2 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/loading_019.png differ diff --git a/app/src/main/res/drawable-xhdpi/loading_020.png b/app/src/main/res/drawable-xhdpi/loading_020.png new file mode 100644 index 000000000..770b5c113 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/loading_020.png differ diff --git a/app/src/main/res/drawable-xhdpi/loading_021.png b/app/src/main/res/drawable-xhdpi/loading_021.png new file mode 100644 index 000000000..be9f4f5d9 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/loading_021.png differ diff --git a/app/src/main/res/drawable-xhdpi/loading_022.png b/app/src/main/res/drawable-xhdpi/loading_022.png new file mode 100644 index 000000000..53f4a813b Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/loading_022.png differ diff --git a/app/src/main/res/drawable-xhdpi/loading_023.png b/app/src/main/res/drawable-xhdpi/loading_023.png new file mode 100644 index 000000000..04d17f505 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/loading_023.png differ diff --git a/app/src/main/res/drawable/anim_loading.xml b/app/src/main/res/drawable/anim_loading.xml new file mode 100644 index 000000000..9cc5c21d6 --- /dev/null +++ b/app/src/main/res/drawable/anim_loading.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_loading.xml b/app/src/main/res/layout/dialog_loading.xml index 67ddf3f39..f287f1ed8 100644 --- a/app/src/main/res/layout/dialog_loading.xml +++ b/app/src/main/res/layout/dialog_loading.xml @@ -1,15 +1,24 @@ - + - + android:src="@drawable/anim_loading" /> + + + + diff --git a/app/src/main/res/layout/layout_progress_dialog.xml b/app/src/main/res/layout/layout_progress_dialog.xml index 7878c72d1..f67c2a77a 100644 --- a/app/src/main/res/layout/layout_progress_dialog.xml +++ b/app/src/main/res/layout/layout_progress_dialog.xml @@ -1,34 +1,29 @@ + android:gravity="center_horizontal" + android:orientation="vertical" + tools:background="@color/black_transparent_10"> - + android:layout_width="240dp" + android:layout_height="160dp" + android:src="@drawable/anim_loading" />