From 5771916ffb24807dd57c1969baa6371611c334da Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期六, 10 十月 2020 16:45:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'supervision/master'
---
app/src/main/java/cn/flightfeather/thirdapp/util/DialogUtil2.kt | 12 ++----------
1 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/util/DialogUtil2.kt b/app/src/main/java/cn/flightfeather/thirdapp/util/DialogUtil2.kt
index fb3bc41..a866f6c 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/util/DialogUtil2.kt
+++ b/app/src/main/java/cn/flightfeather/thirdapp/util/DialogUtil2.kt
@@ -13,6 +13,7 @@
import android.widget.TextView
import cn.flightfeather.thirdapp.R
import cn.flightfeather.thirdapp.module.base.BaseActivity
+import cn.flightfeather.thirdapp.view.PopupWindowWithMask
/**
* @author riku
@@ -56,7 +57,7 @@
) {
val view = LayoutInflater.from(activity).inflate(R.layout.dialog_bottom_sheet, null)
activity?.let {
- PopupWindow(it).apply popupWindow@{
+ PopupWindowWithMask(it).apply popupWindow@{
isFocusable = true
isOutsideTouchable = true
contentView = view
@@ -80,17 +81,8 @@
width = ViewGroup.LayoutParams.MATCH_PARENT
animationStyle = R.style.PopWin_bottom_anim_style
background.alpha = 0
- setOnDismissListener {
- val wl = activity.window.attributes
- wl.alpha = 1f
- activity.window.attributes = wl
- }
}.run {
- val wl = activity.window.attributes
- wl.alpha = 0.9f
- activity.window.attributes = wl
showAtLocation(anchorView, Gravity.BOTTOM, 0, 0)
-
}
}
}
--
Gitblit v1.9.3