diff --git a/app/src/main/java/com/gh/base/fragment/WaitingDialogFragment.java b/app/src/main/java/com/gh/base/fragment/WaitingDialogFragment.java index 0ccba770c4..a61c823027 100644 --- a/app/src/main/java/com/gh/base/fragment/WaitingDialogFragment.java +++ b/app/src/main/java/com/gh/base/fragment/WaitingDialogFragment.java @@ -4,12 +4,14 @@ import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.view.WindowManager; import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.fragment.app.FragmentManager; +import com.gh.common.util.DisplayUtils; import com.gh.common.util.ExtensionsKt; import com.gh.gamecenter.R; @@ -53,6 +55,14 @@ public class WaitingDialogFragment extends BaseDialogFragment { return view; } + @Override + public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + WindowManager.LayoutParams layoutParams = getDialog().getWindow().getAttributes(); + layoutParams.width = DisplayUtils.dip2px(160); + getDialog().getWindow().setAttributes(layoutParams); + } + @Override public void show(FragmentManager manager, String tag) { try { diff --git a/app/src/main/java/com/gh/common/util/DialogHelper.kt b/app/src/main/java/com/gh/common/util/DialogHelper.kt index 4558abad0e..1d44245346 100644 --- a/app/src/main/java/com/gh/common/util/DialogHelper.kt +++ b/app/src/main/java/com/gh/common/util/DialogHelper.kt @@ -17,6 +17,7 @@ import com.gh.gamecenter.AboutActivity import com.gh.gamecenter.R import com.gh.gamecenter.databinding.DialogAlertDefaultBinding import com.gh.gamecenter.databinding.DialogProgressBinding +import com.gh.gamecenter.databinding.SetWaitDialogBinding import splitties.systemservices.layoutInflater object DialogHelper { @@ -173,10 +174,11 @@ object DialogHelper { val dialog = Dialog(context) val binding = DialogProgressBinding.inflate(context.layoutInflater) binding.contentTv.text = content - binding.loadingLottie.setAnimation("lottie/loading.json") dialog.requestWindowFeature(Window.FEATURE_NO_TITLE) dialog.setContentView(binding.root) dialog.setCanceledOnTouchOutside(false) + dialog.window?.setBackgroundDrawableResource(R.drawable.background_shape_white_radius_8) + dialog.window?.attributes = dialog.window?.attributes?.apply { width = 160F.dip2px() } uiModificationCallback?.invoke(binding) dialog.show() return dialog diff --git a/app/src/main/java/com/gh/common/util/DialogUtils.java b/app/src/main/java/com/gh/common/util/DialogUtils.java index dff535fb35..7f9d2f8020 100644 --- a/app/src/main/java/com/gh/common/util/DialogUtils.java +++ b/app/src/main/java/com/gh/common/util/DialogUtils.java @@ -113,6 +113,10 @@ public class DialogUtils { dialog.requestWindowFeature(Window.FEATURE_NO_TITLE); dialog.setContentView(view); dialog.setCanceledOnTouchOutside(false); + dialog.getWindow().setBackgroundDrawableResource(R.drawable.background_shape_white_radius_8); + WindowManager.LayoutParams layoutParams = dialog.getWindow().getAttributes(); + layoutParams.width = DisplayUtils.dip2px(160); + dialog.getWindow().setAttributes(layoutParams); dialog.show(); return dialog; } diff --git a/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java index 44e1dc7903..185b5c06e8 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java @@ -195,9 +195,9 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { viewHolder.binding.dmItemTvDownloads.setTextColor(0xFF9A9A9A); viewHolder.binding.dmItemTvDownloads.setText("等待中"); viewHolder.binding.dmItemIvDelete.setVisibility(View.VISIBLE); - viewHolder.binding.dmItemTvStartorpause.setBackgroundResource(R.drawable.game_item_btn_downloading_bg); + viewHolder.binding.dmItemTvStartorpause.setBackgroundResource(R.drawable.news_detail_comment); viewHolder.binding.dmItemTvStartorpause.setText("等待"); - viewHolder.binding.dmItemTvStartorpause.setTextColor(ContextCompat.getColor(mContext, R.color.theme_font)); + viewHolder.binding.dmItemTvStartorpause.setTextColor(ContextCompat.getColor(mContext, R.color.button_gray)); viewHolder.binding.dmItemTvSpeed.setText(downloadEntity.getPercent() + "%"); } else if (status.equals(DownloadStatus.pause) || status.equals(DownloadStatus.timeout) diff --git a/app/src/main/res/layout/dialog_progress.xml b/app/src/main/res/layout/dialog_progress.xml index c6a241a44b..6df0328a55 100644 --- a/app/src/main/res/layout/dialog_progress.xml +++ b/app/src/main/res/layout/dialog_progress.xml @@ -1,29 +1,28 @@ + android:orientation="vertical" + android:paddingTop="16dp" + android:paddingBottom="16dp"> diff --git a/app/src/main/res/layout/layout_setting_item.xml b/app/src/main/res/layout/layout_setting_item.xml index c780bfe417..4069469b17 100644 --- a/app/src/main/res/layout/layout_setting_item.xml +++ b/app/src/main/res/layout/layout_setting_item.xml @@ -55,7 +55,7 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:includeFontPadding="false" - android:lineSpacingExtra="4dp" + android:lineHeight="16dp" android:textColor="@color/text_subtitleDesc" android:textSize="@dimen/secondary_size" android:visibility="gone" diff --git a/app/src/main/res/layout/set_wait_dialog.xml b/app/src/main/res/layout/set_wait_dialog.xml index c7cf06687e..97b5c13542 100644 --- a/app/src/main/res/layout/set_wait_dialog.xml +++ b/app/src/main/res/layout/set_wait_dialog.xml @@ -1,29 +1,27 @@ + android:orientation="vertical" + android:paddingTop="16dp" + android:paddingBottom="16dp">