remove MyApp instance

o0o0oo00 · Mar 22, 2019 · be3d593 · be3d593
1 parent 02f7b61
commit be3d593
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 28 deletions.
diff --git a/fancydialog/src/main/AndroidManifest.xml b/fancydialog/src/main/AndroidManifest.xml
@@ -1,4 +1,3 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.zcy.fancydialog">
-    <application android:name=".MyApp"/>
 </manifest>
diff --git a/fancydialog/src/main/java/com/zcy/fancydialog/AskDialog.kt b/fancydialog/src/main/java/com/zcy/fancydialog/AskDialog.kt
@@ -26,16 +26,18 @@ open class AskDialog : BaseFragmentDialog() {
     var mMessage: String? = null
     var msgGravity: Int = Gravity.CENTER
     var onlySure: Boolean = false
-    var mColor: Int = MyApp.instance.color(R.color.colorAccent)
-    var mCancelText: String = MyApp.instance.string(R.string.cancel)
-    var mSureText: String = MyApp.instance.string(R.string.sure)
+    var mColor: Int = 0
+    var mCancelText: String = ""
+    var mSureText: String = ""
 
     protected var cancelClicks: (() -> Unit)? = null
     protected var sureClicks: (() -> Unit)? = null
 
     override fun setView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         val view = inflater.inflate(R.layout.layout_ask_dialog, container, false)
-
+        mCancelText = mContext.string(R.string.cancel)
+        mSureText = mContext.string(R.string.sure)
+        mColor = mContext.color(R.color.colorAccent)
         val dialogTitle = view.findViewById<AppCompatTextView>(R.id.title)
         val dialogMessage = view.findViewById<AppCompatTextView>(R.id.message)
         val sureButton = view.findViewById<AppCompatTextView>(R.id.sure)

diff --git a/fancydialog/src/main/java/com/zcy/fancydialog/EditDialog.kt b/fancydialog/src/main/java/com/zcy/fancydialog/EditDialog.kt
@@ -31,13 +31,13 @@ class DSLEditDialog : BaseFragmentDialog() {
     var mMessage: String? = null
     var mHint: String? = null
     var mDefault: String = ""
-    var mColor: Int = MyApp.instance.color(R.color.colorAccent)
+    var mColor: Int = 0
     var mPosition: Int? = null
     var mMaxLength: Int = 16
 
 
-    private var mLeftText: String = MyApp.instance.string(R.string.cancel)
-    private var mRightText: String = MyApp.instance.string(R.string.sure)
+    private var mLeftText: String = ""
+    private var mRightText: String = ""
     private var leftClicks: (() -> Unit)? = null
     private var rightClicks: ((String) -> Unit)? = null
 
@@ -50,6 +50,9 @@ class DSLEditDialog : BaseFragmentDialog() {
     private lateinit var edit: AppCompatEditText
     override fun setView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         val view = inflater.inflate(R.layout.layout_edit_dialog, container, false)
+        mColor = mContext.color(R.color.colorAccent)
+        mLeftText = mContext.string(R.string.cancel)
+        mRightText = mContext.string(R.string.sure)
         rootView = view
         edit = view.findViewById<AppCompatEditText>(R.id.labelEdit)
         edit.setText(mDefault)

diff --git a/fancydialog/src/main/java/com/zcy/fancydialog/ListDialog.kt b/fancydialog/src/main/java/com/zcy/fancydialog/ListDialog.kt
@@ -24,7 +24,7 @@ inline fun listDialog(block: ListDialog.() -> Unit): ListDialog {
 class ListDialog : BaseFragmentDialog() {
     var mLayoutManager: RecyclerView.LayoutManager? = null
     var mParentPadding: Int = 0
-    var mPaddingTop: Int = MyApp.instance.dp2px(10F)
+    var mPaddingTop: Int = 0
     var mPaddingLeft: Int = 0
     var mPaddingRight: Int = 0
     var mPaddingBottom: Int = 0
@@ -34,6 +34,7 @@ class ListDialog : BaseFragmentDialog() {
 
     override fun setView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         val view = inflater.inflate(R.layout.layout_list_dialog, container, false)
+        mPaddingTop = mContext.dp2px(10F)
         view.setPadding(mPaddingLeft, mPaddingTop, mPaddingRight, mPaddingBottom)
         mBackground?.let { view.background = resources.getDrawable(it) }
         val recyclerView = view.findViewById<RecyclerView>(R.id.recyclerView)

diff --git a/fancydialog/src/main/java/com/zcy/fancydialog/MyApp.kt b/fancydialog/src/main/java/com/zcy/fancydialog/MyApp.kt