diff --git a/.travis.yml b/.travis.yml
index 3832d22..462235d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@ android:
       - platform-tools
       - tools
       - build-tools-23.0.3
-      - android-23
+      - android-26
       - extra-android-m2repository
       - extra-google-m2repository
 script:
diff --git a/blockcanary/build.gradle b/blockcanary/build.gradle
index 126edec..1eaff97 100644
--- a/blockcanary/build.gradle
+++ b/blockcanary/build.gradle
@@ -35,6 +35,7 @@ dependencies {
     compile project(':views')
     testCompile "junit:junit:${libs.junit}"
     provided "com.android.support:appcompat-v7:${libs.support}"
+    provided "com.android.support:support-compat:${libs.support}"
     compile "org.jetbrains.kotlin:kotlin-stdlib:${libs.kotlin}"
 }
 repositories {
diff --git a/blockcanary/src/main/kotlin/com/exyui/android/debugbottle/ui/layout/__BlockDetailAdapter.kt b/blockcanary/src/main/kotlin/com/exyui/android/debugbottle/ui/layout/__BlockDetailAdapter.kt
index 1146fe9..27b7013 100644
--- a/blockcanary/src/main/kotlin/com/exyui/android/debugbottle/ui/layout/__BlockDetailAdapter.kt
+++ b/blockcanary/src/main/kotlin/com/exyui/android/debugbottle/ui/layout/__BlockDetailAdapter.kt
@@ -31,13 +31,13 @@ internal class __BlockDetailAdapter : BaseAdapter() {
             if (view == null) {
                 view = LayoutInflater.from(context).inflate(R.layout.__dt_canary_ref_top_row, parent, false)
             }
-            val textView = view!!.findViewById(R.id.__dt_canary_row_text) as TextView
+            val textView = view!!.findViewById<TextView>(R.id.__dt_canary_row_text)
             textView.text = context.packageName
         } else {
             if (view == null) {
                 view = LayoutInflater.from(context).inflate(R.layout.__dt_canary_ref_row, parent, false)
             }
-            val textView = view!!.findViewById(R.id.__dt_canary_row_text) as TextView
+            val textView = view!!.findViewById<TextView>(R.id.__dt_canary_row_text)
 
             val isThreadStackEntry = position == POSITION_THREAD_STACK + 1
             val element = getItem(position)
@@ -47,10 +47,10 @@ internal class __BlockDetailAdapter : BaseAdapter() {
             }
             textView.text = Html.fromHtml(htmlString)
 
-            val connectorView = view.findViewById(R.id.__dt_canary_row_connector) as __DisplayLeakConnectorView
+            val connectorView = view.findViewById<__DisplayLeakConnectorView>(R.id.__dt_canary_row_connector)
             connectorView.setType(connectorViewType(position))
 
-            val moreDetailsView = view.findViewById(R.id.__dt_canary_row_more) as __MoreDetailsView
+            val moreDetailsView = view.findViewById<__MoreDetailsView>(R.id.__dt_canary_row_more)
             moreDetailsView.setFolding(mFoldings[position])
         }
 
@@ -58,13 +58,11 @@ internal class __BlockDetailAdapter : BaseAdapter() {
     }
 
     private fun connectorViewType(position: Int): __DisplayLeakConnectorView.Type {
-        return if (position == 1)
-            __DisplayLeakConnectorView.Type.START
-        else
-            if (position == count - 1)
-                __DisplayLeakConnectorView.Type.END
-            else
-                __DisplayLeakConnectorView.Type.NODE
+        return when (position) {
+            1 -> __DisplayLeakConnectorView.Type.START
+            count - 1 -> __DisplayLeakConnectorView.Type.END
+            else -> __DisplayLeakConnectorView.Type.NODE
+        }
     }
 
     private fun elementToHtmlString(element: String?, position: Int, folding: Boolean): String {
@@ -134,12 +132,12 @@ internal class __BlockDetailAdapter : BaseAdapter() {
         if (getItemViewType(position) == TOP_ROW) {
             return null
         }
-        when (position) {
-            POSITION_BASIC -> return mBlock?.basicString
-            POSITION_TIME -> return mBlock?.timeString
-            POSITION_CPU -> return mBlock?.cpuString
-            //POSITION_THREAD_STACK,
-            else -> return mBlock?.threadStackEntries?.get(position - POSITION_THREAD_STACK)
+        return when (position) {
+            POSITION_BASIC -> mBlock?.basicString
+            POSITION_TIME -> mBlock?.timeString
+            POSITION_CPU -> mBlock?.cpuString
+        //POSITION_THREAD_STACK,
+            else -> mBlock?.threadStackEntries?.get(position - POSITION_THREAD_STACK)
         }
     }
 
@@ -169,12 +167,12 @@ internal class __BlockDetailAdapter : BaseAdapter() {
 
     companion object {
 
-        private val TOP_ROW = 0
-        private val NORMAL_ROW = 1
+        private const val TOP_ROW = 0
+        private const val NORMAL_ROW = 1
 
-        private val POSITION_BASIC = 1
-        private val POSITION_TIME = 2
-        private val POSITION_CPU = 3
-        private val POSITION_THREAD_STACK = 4
+        private const val POSITION_BASIC = 1
+        private const val POSITION_TIME = 2
+        private const val POSITION_CPU = 3
+        private const val POSITION_THREAD_STACK = 4
     }
 }
diff --git a/blockcanary/src/main/kotlin/com/exyui/android/debugbottle/ui/layout/__DisplayBlockActivity.kt b/blockcanary/src/main/kotlin/com/exyui/android/debugbottle/ui/layout/__DisplayBlockActivity.kt
index 7947d63..fca5adb 100644
--- a/blockcanary/src/main/kotlin/com/exyui/android/debugbottle/ui/layout/__DisplayBlockActivity.kt
+++ b/blockcanary/src/main/kotlin/com/exyui/android/debugbottle/ui/layout/__DisplayBlockActivity.kt
@@ -60,9 +60,9 @@ class __DisplayBlockActivity : Activity() {
     private val mBlockEntries: MutableList<__Block> by lazy { ArrayList<__Block>() }
     private var mBlockStartTime: String? = null
 
-    private val mListView by lazy { findViewById(R.id.__dt_canary_display_leak_list) as ListView }
-    private val mFailureView by lazy { findViewById(R.id.__dt_canary_display_leak_failure) as TextView }
-    private val mActionButton by lazy { findViewById(R.id.__dt_canary_action) as Button }
+    private val mListView by lazy { findViewById<ListView>(R.id.__dt_canary_display_leak_list) }
+    private val mFailureView by lazy { findViewById<TextView>(R.id.__dt_canary_display_leak_failure) }
+    private val mActionButton by lazy { findViewById<Button>(R.id.__dt_canary_action) }
     private val mMaxStoredBlockCount by lazy { resources.getInteger(R.integer.__block_canary_max_stored_count) }
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -191,7 +191,7 @@ class __DisplayBlockActivity : Activity() {
         } else {
             val adapter = BlockListAdapter()
             mListView.adapter = adapter
-            mListView.onItemClickListener = AdapterView.OnItemClickListener { parent, view, position, id ->
+            mListView.onItemClickListener = AdapterView.OnItemClickListener { _, _, position, _ ->
                 mBlockStartTime = mBlockEntries[position].timeStart
                 updateUi()
             }
@@ -219,7 +219,7 @@ class __DisplayBlockActivity : Activity() {
         } else {
             adapter = __BlockDetailAdapter()
             mListView.adapter = adapter
-            mListView.onItemClickListener = AdapterView.OnItemClickListener { parent, view, position, id -> adapter.toggleRow(position) }
+            mListView.onItemClickListener = AdapterView.OnItemClickListener { _, _, position, _ -> adapter.toggleRow(position) }
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
                 invalidateOptionsMenu()
                 val actionBar = actionBar
@@ -271,8 +271,8 @@ class __DisplayBlockActivity : Activity() {
             if (view == null) {
                 view = LayoutInflater.from(this@__DisplayBlockActivity).inflate(R.layout.__dt_canary_block_row, parent, false)
             }
-            val titleView = view!!.findViewById(R.id.__dt_canary_row_text) as TextView
-            val timeView = view.findViewById(R.id.__dt_canary_row_time) as TextView
+            val titleView = view!!.findViewById<TextView>(R.id.__dt_canary_row_text)
+            val timeView = view.findViewById<TextView>(R.id.__dt_canary_row_time)
             val block = getItem(position)
 
             val index: String
diff --git a/blockcanary/src/main/kotlin/com/exyui/android/debugbottle/ui/layout/__Notifier.kt b/blockcanary/src/main/kotlin/com/exyui/android/debugbottle/ui/layout/__Notifier.kt
index f16abcb..99a6047 100644
--- a/blockcanary/src/main/kotlin/com/exyui/android/debugbottle/ui/layout/__Notifier.kt
+++ b/blockcanary/src/main/kotlin/com/exyui/android/debugbottle/ui/layout/__Notifier.kt
@@ -2,17 +2,19 @@ package com.exyui.android.debugbottle.ui.layout
 
 import android.annotation.TargetApi
 import android.app.Notification
+import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.app.PendingIntent
+import android.app.PendingIntent.FLAG_UPDATE_CURRENT
 import android.content.Context
 import android.content.Intent
+import android.os.Build
+import android.os.Build.VERSION_CODES.HONEYCOMB
+import android.support.annotation.RequiresApi
+import android.support.v4.app.NotificationCompat
 import com.exyui.android.debugbottle.core.__OnBlockEventInterceptor
 import com.exyui.android.debugbottle.ui.R
 
-import android.app.PendingIntent.FLAG_UPDATE_CURRENT
-import android.os.Build.VERSION.SDK_INT
-import android.os.Build.VERSION_CODES.HONEYCOMB
-import android.os.Build.VERSION_CODES.JELLY_BEAN
 /**
  * Created by yuriel on 8/9/16.
  */
@@ -31,31 +33,29 @@ internal class __Notifier : __OnBlockEventInterceptor {
     @Suppress("DEPRECATION")
     @TargetApi(HONEYCOMB)
     private fun show(context: Context, contentTitle: String, contentText: String, pendingIntent: PendingIntent) {
+        val channelId = "default"
+        val builder = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
+            NotificationCompat.Builder(context, channelId)
+        else {
+            NotificationCompat.Builder(context)
+        }
+        builder.setSmallIcon(R.drawable.__block_canary_notification)
+                .setWhen(System.currentTimeMillis())
+                .setContentTitle(contentTitle)
+                .setContentText(contentText)
+                .setAutoCancel(true)
+                .setContentIntent(pendingIntent)
+                .setDefaults(Notification.DEFAULT_SOUND)
+
         val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            notificationManager.createNotificationChannel(createChannel(channelId))
+        }
+        notificationManager.notify(0xDEAFBEEF.toInt(), builder.build())
+    }
 
-        val notification: Notification
-//        if (SDK_INT < HONEYCOMB) {
-//            notification = Notification()
-//            notification.icon = R.drawable.__block_canary_notification
-//            notification.`when` = System.currentTimeMillis()
-//            notification.flags = notification.flags or Notification.FLAG_AUTO_CANCEL
-//            notification.defaults = Notification.DEFAULT_SOUND
-//            notification.setLatestEventInfo(context, contentTitle, contentText, pendingIntent)
-//        } else {
-            val builder = Notification.Builder(context)
-                    .setSmallIcon(R.drawable.__block_canary_notification)
-                    .setWhen(System.currentTimeMillis())
-                    .setContentTitle(contentTitle)
-                    .setContentText(contentText)
-                    .setAutoCancel(true)
-                    .setContentIntent(pendingIntent)
-                    .setDefaults(Notification.DEFAULT_SOUND)
-            if (SDK_INT < JELLY_BEAN) {
-                notification = builder.notification
-            } else {
-                notification = builder.build()
-            }
-//        }
-        notificationManager.notify(0xDEAFBEEF.toInt(), notification)
+    @RequiresApi(Build.VERSION_CODES.O)
+    private fun createChannel(channelId: String): NotificationChannel? {
+        return NotificationChannel(channelId, channelId, NotificationManager.IMPORTANCE_DEFAULT)
     }
 }
diff --git a/build.gradle b/build.gradle
index 20bbd40..67ee9ae 100644
--- a/build.gradle
+++ b/build.gradle
@@ -28,9 +28,9 @@ buildscript {
         libraries = [
                 gradle: '2.2.1',
                 kotlin: '1.1.4-3',
-                support: '23.4.0',
+                support: '27.0.2',
                 junit: '4.12',
-                leakcanary: '1.4',
+                leakcanary: '1.5.4',
                 okhttp: '2.4.0',
                 okhttp3: '3.4.2',
                 debugbottle: versionUploaded
@@ -40,6 +40,7 @@ buildscript {
     repositories {
         mavenCentral()
         jcenter()
+        maven { url 'https://dl.google.com/dl/android/maven2/' }
         maven {
             url "https://oss.sonatype.org/content/repositories/snapshots"
         }
@@ -61,6 +62,7 @@ allprojects {
     repositories {
         mavenCentral()
         jcenter()
+        maven { url 'https://dl.google.com/dl/android/maven2/' }
         maven {
             url "https://oss.sonatype.org/content/repositories/snapshots"
         }
diff --git a/components/src/main/kotlin/com/exyui/android/debugbottle/components/DTActivityManager.kt b/components/src/main/kotlin/com/exyui/android/debugbottle/components/DTActivityManager.kt
index a3d6b4c..3d1fb03 100644
--- a/components/src/main/kotlin/com/exyui/android/debugbottle/components/DTActivityManager.kt
+++ b/components/src/main/kotlin/com/exyui/android/debugbottle/components/DTActivityManager.kt
@@ -9,7 +9,7 @@ import kotlin.properties.Delegates
 internal object DTActivityManager {
     private var injected = false
 
-    var topActivity by Delegates.observable<Activity?>(null) { prop, old, new ->
+    var topActivity by Delegates.observable<Activity?>(null) { _, _, new ->
         if (!injected && new != null) {
             injected = DTInstaller.startInject()
         }
diff --git a/components/src/main/kotlin/com/exyui/android/debugbottle/components/DTDrawerActivity.kt b/components/src/main/kotlin/com/exyui/android/debugbottle/components/DTDrawerActivity.kt
index 8e7e94a..2d27123 100644
--- a/components/src/main/kotlin/com/exyui/android/debugbottle/components/DTDrawerActivity.kt
+++ b/components/src/main/kotlin/com/exyui/android/debugbottle/components/DTDrawerActivity.kt
@@ -1,6 +1,5 @@
 package com.exyui.android.debugbottle.components
 
-import android.Manifest
 import android.app.ActivityManager
 import android.content.Intent
 import android.net.Uri
@@ -42,12 +41,12 @@ internal class DTDrawerActivity : AppCompatActivity(), DialogsCollection.SPDialo
         resources.getStringArray(R.array.__dt_drawer_items)
     }
 
-    private val drawerLayout by lazy { findViewById(R.id.__dt_drawer_layout) as DrawerLayout }
+    private val drawerLayout by lazy { findViewById<DrawerLayout>(R.id.__dt_drawer_layout) }
 
-    private val drawerRoot by lazy { findViewById(R.id.__dt_drawer_root) as ViewGroup }
+    private val drawerRoot by lazy { findViewById<ViewGroup>(R.id.__dt_drawer_root) }
 
     private val drawerListView by lazy {
-        (findViewById(R.id.__dt_left_drawer) as ListView).apply {
+        findViewById<ListView>(R.id.__dt_left_drawer).apply {
             adapter = DrawerAdapter(titles)
             setOnItemClickListener { _: AdapterView<*>?, _: View?, position: Int, _: Long ->
                 selectItem(position)
@@ -55,16 +54,16 @@ internal class DTDrawerActivity : AppCompatActivity(), DialogsCollection.SPDialo
         }
     }
 
-    private val contentFrame by lazy { findViewById(R.id.__dt_content_frame) as ViewGroup }
+    private val contentFrame by lazy { findViewById<ViewGroup>(R.id.__dt_content_frame) }
 
     private val drawerToggle by lazy {
         object: ActionBarDrawerToggle(this, drawerLayout, R.string.__dt_drawer_open, R.string.__dt_drawer_close) {
-            override fun onDrawerOpened(drawerView: View?) {
+            override fun onDrawerOpened(drawerView: View) {
                 super.onDrawerOpened(drawerView)
                 invalidateOptionsMenu() // creates call to onPrepareOptionsMenu()
             }
 
-            override fun onDrawerClosed(drawerView: View?) {
+            override fun onDrawerClosed(drawerView: View) {
                 super.onDrawerClosed(drawerView)
                 invalidateOptionsMenu() // creates call to onPrepareOptionsMenu()
             }
@@ -72,7 +71,7 @@ internal class DTDrawerActivity : AppCompatActivity(), DialogsCollection.SPDialo
     }
 
     private val infoLayout by lazy {
-        (findViewById(R.id.__dt_info) as ViewGroup).apply {
+        findViewById<ViewGroup>(R.id.__dt_info).apply {
             setOnClickListener {
                 AlertDialog.Builder(this@DTDrawerActivity)
                         .setIcon(R.drawable.__dt_ic_bottle_24dp)
@@ -91,7 +90,7 @@ internal class DTDrawerActivity : AppCompatActivity(), DialogsCollection.SPDialo
     }
 
     private val introLayout by lazy {
-        (findViewById(R.id.__dt_helper) as ViewGroup).apply {
+        findViewById<ViewGroup>(R.id.__dt_helper).apply {
             setOnClickListener {
 
                 // To start IntroductionActivity, need a AppCompatTheme.
@@ -336,8 +335,8 @@ internal class DTDrawerActivity : AppCompatActivity(), DialogsCollection.SPDialo
             val item = menu[position]
             (view?.let { view?.tag as ViewHolder }?: ViewHolder().apply {
                 view = LayoutInflater.from(this@DTDrawerActivity).inflate(R.layout.__item_drawer_menu, parent, false)
-                icon = view?.findViewById(R.id.__dt_icon) as ImageView
-                title = view?.findViewById(R.id.__dt_item_title) as TextView
+                icon = view?.findViewById<ImageView>(R.id.__dt_icon)
+                title = view?.findViewById<TextView>(R.id.__dt_item_title)
                 view?.tag = this
             }).apply {
                 icon?.setImageResource(item.icon)
diff --git a/components/src/main/kotlin/com/exyui/android/debugbottle/components/DTReportMgr.kt b/components/src/main/kotlin/com/exyui/android/debugbottle/components/DTReportMgr.kt
index a521fe0..f4bf6c6 100644
--- a/components/src/main/kotlin/com/exyui/android/debugbottle/components/DTReportMgr.kt
+++ b/components/src/main/kotlin/com/exyui/android/debugbottle/components/DTReportMgr.kt
@@ -41,7 +41,7 @@ internal abstract class DTReportMgr {
         get() {
             val f = detectedFileDirectory()
             if (f.exists() && f.isDirectory) {
-                return f.listFiles { dir, filename ->
+                return f.listFiles { _, filename ->
                     filename.endsWith(TYPE)
                 }
             }
diff --git a/components/src/main/kotlin/com/exyui/android/debugbottle/components/DialogsCollection.kt b/components/src/main/kotlin/com/exyui/android/debugbottle/components/DialogsCollection.kt
index 5db1042..2906d92 100644
--- a/components/src/main/kotlin/com/exyui/android/debugbottle/components/DialogsCollection.kt
+++ b/components/src/main/kotlin/com/exyui/android/debugbottle/components/DialogsCollection.kt
@@ -1,5 +1,6 @@
 package com.exyui.android.debugbottle.components
 
+import android.annotation.SuppressLint
 import android.app.*
 import android.content.Context
 import android.content.Intent
@@ -67,14 +68,14 @@ internal object DialogsCollection {
         }
 
         private fun View.init() {
-            val content = findViewById(R.id.__dt_intent_content) as ViewGroup
-            val key = findViewById(R.id.__dt_intent_key) as TextView
+            val content = findViewById<ViewGroup>(R.id.__dt_intent_content)
+            val key = findViewById<TextView>(R.id.__dt_intent_key)
 
 
-            (findViewById(R.id.__dt_activity_name) as TextView).apply {
+            findViewById<TextView>(R.id.__dt_activity_name).apply {
                 text = intent?.component?.className?: ""
             }
-            (findViewById(R.id.__dt_title) as TextView).apply {
+            findViewById<TextView>(R.id.__dt_title).apply {
                 text = getString(R.string.__run_activity_with_intent)
             }
 
@@ -96,7 +97,7 @@ internal object DialogsCollection {
                 }
             }
 
-            val et = (findViewById(R.id.__dt_edit_text) as DebugToolEditText).apply {
+            val et = findViewById<DebugToolEditText>(R.id.__dt_edit_text).apply {
                 addTextChangedListener(object: TextWatcher {
                     override fun onTextChanged(s: CharSequence?, start: Int, before: Int, after: Int) {
                         if (key.text.isEmpty()) {
@@ -136,9 +137,10 @@ internal object DialogsCollection {
                 }
             }
 
-            (findViewById(R.id.__dt_edit_submit) as Button).setOnClickListener { et.putExtra() }
+            findViewById<Button>(R.id.__dt_edit_submit).setOnClickListener { et.putExtra() }
         }
 
+        @SuppressLint("SetTextI18n")
         private fun updateContentGroup(parent: ViewGroup) {
             parent.removeAllViews()
             val onDelClickListener = { v: View ->
@@ -149,19 +151,19 @@ internal object DialogsCollection {
             }
             for ((k, v) in intentExtras) {
                 val view = inflater.inflate(R.layout.__item_intents_content, parent, false)
-                (view.findViewById(R.id.__dt_delete)).apply {
+                view.findViewById<View>(R.id.__dt_delete).apply {
                     tag = Pair(k, v)
                     setOnClickListener(onDelClickListener)
                 }
-                (view.findViewById(R.id.__dt_intent_content_kv) as TextView).apply { text = "$k: $v" }
-                val anyBtn = view.findViewById(R.id.__dt_radio_any) as RadioButton
+                view.findViewById<TextView>(R.id.__dt_intent_content_kv).apply { text = "$k: $v" }
+                val anyBtn = view.findViewById<RadioButton>(R.id.__dt_radio_any)
 //                val stringBtn = view.findViewById(R.id.__dt_radio_string) as RadioButton
-                (view.findViewById(R.id.__dt_radio_group) as RadioGroup).apply {
+                view.findViewById<RadioGroup>(R.id.__dt_radio_group).apply {
                     visibility = View.VISIBLE
                     if (v !is String) {
                         check(R.id.__dt_radio_any)
                         anyBtn.text = v.javaClass.simpleName
-                        setOnCheckedChangeListener { radioGroup, id ->
+                        setOnCheckedChangeListener { _, id ->
                             when(id) {
                                 R.id.__dt_radio_any -> intentExtras.put(k, v)
                                 R.id.__dt_radio_string -> intentExtras.put(k, v.toString())
@@ -237,8 +239,8 @@ internal object DialogsCollection {
             if (null == sp || null == key) return null
             val content = inflater.inflate(R.layout.__dialog_sp_edit, null)
 
-            val editView = content.findViewById(R.id.__dt_sp_value) as TextView
-            val radio = content.findViewById(R.id.__dt_radio_group) as RadioGroup
+            val editView = content.findViewById<TextView>(R.id.__dt_sp_value)
+            val radio = content.findViewById<RadioGroup>(R.id.__dt_radio_group)
 
             var value: Any? = null
 
@@ -269,7 +271,7 @@ internal object DialogsCollection {
                 is Double -> editView.setRawInputType(InputType.TYPE_NUMBER_FLAG_DECIMAL)
             }
 
-            (content.findViewById(R.id.__dt_sp_key) as TextView).apply { text = key }
+            content.findViewById<TextView>(R.id.__dt_sp_key).apply { text = key }
 
             return AlertDialog.Builder(activity)
                     .setView(content)
diff --git a/components/src/main/kotlin/com/exyui/android/debugbottle/components/RunningFeatureMgr.kt b/components/src/main/kotlin/com/exyui/android/debugbottle/components/RunningFeatureMgr.kt
index 1789ede..e987ac0 100644
--- a/components/src/main/kotlin/com/exyui/android/debugbottle/components/RunningFeatureMgr.kt
+++ b/components/src/main/kotlin/com/exyui/android/debugbottle/components/RunningFeatureMgr.kt
@@ -18,7 +18,7 @@ internal object RunningFeatureMgr {
     val FPS_DISPLAYER = 1 shl 8
     val MONKEY_BLACKLIST = 1 shl 9
 
-    private var flags by Delegates.observable(0) { prop, old, new ->
+    private var flags by Delegates.observable(0) { _, old, new ->
         Log.d("RunningFeatureMgr", "old: $old, new: $new")
     }
 
diff --git a/components/src/main/kotlin/com/exyui/android/debugbottle/components/bubbles/services/__3DViewBubble.kt b/components/src/main/kotlin/com/exyui/android/debugbottle/components/bubbles/services/__3DViewBubble.kt
index 1e3f4ae..ea8b0bb 100644
--- a/components/src/main/kotlin/com/exyui/android/debugbottle/components/bubbles/services/__3DViewBubble.kt
+++ b/components/src/main/kotlin/com/exyui/android/debugbottle/components/bubbles/services/__3DViewBubble.kt
@@ -1,8 +1,10 @@
 package com.exyui.android.debugbottle.components.bubbles.services
 
+import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Context
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
 import com.exyui.android.debugbottle.components.DTActivityManager
 import com.exyui.android.debugbottle.components.R
@@ -14,6 +16,7 @@ import com.exyui.android.debugbottle.components.widgets.__ScalpelFrameLayout
 /**
  * Created by yuriel on 9/23/16.
  */
+@SuppressLint("StaticFieldLeak")
 internal object __3DViewBubble:
         __DTBubble(__BubblesManager),
         __BubbleLayout.OnBubbleClickListener,
@@ -30,10 +33,6 @@ internal object __3DViewBubble:
         return bubbleView
     }
 
-    override fun onDestroy(context: Context) {
-        super.onDestroy(context)
-    }
-
     override fun isRunning() = RunningFeatureMgr.has(RunningFeatureMgr.VIEW_3D_WINDOW)
 
     override fun onBubbleRemoved(bubble: __BubbleLayout) {
@@ -50,7 +49,7 @@ internal object __3DViewBubble:
     private fun attachActivityTo3DView(activity: Activity) {
         val layout: __ScalpelFrameLayout
         val decorView: ViewGroup = activity.window.decorView as ViewGroup
-        if (decorView.findViewById(R.id.__dt_scalpel_frame_layout) == null) {
+        if (decorView.findViewById<View>(R.id.__dt_scalpel_frame_layout) == null) {
             layout = __ScalpelFrameLayout(activity)
             layout.id = R.id.__dt_scalpel_frame_layout
             val rootView = decorView.getChildAt(0)
@@ -59,7 +58,7 @@ internal object __3DViewBubble:
             layout.addView(rootView)
             decorView.addView(layout)
         } else {
-            layout = decorView.findViewById(R.id.__dt_scalpel_frame_layout) as __ScalpelFrameLayout
+            layout = decorView.findViewById(R.id.__dt_scalpel_frame_layout)
         }
 
         if (!layout.isLayerInteractionEnabled) {
diff --git a/components/src/main/kotlin/com/exyui/android/debugbottle/components/crash/CrashBlockDetailAdapter.kt b/components/src/main/kotlin/com/exyui/android/debugbottle/components/crash/CrashBlockDetailAdapter.kt
index 591c42e..2a5eb02 100644
--- a/components/src/main/kotlin/com/exyui/android/debugbottle/components/crash/CrashBlockDetailAdapter.kt
+++ b/components/src/main/kotlin/com/exyui/android/debugbottle/components/crash/CrashBlockDetailAdapter.kt
@@ -26,22 +26,22 @@ internal class CrashBlockDetailAdapter: BaseAdapter() {
             if (view == null) {
                 view = LayoutInflater.from(context).inflate(R.layout.__dt_canary_ref_top_row, parent, false)
             }
-            val textView = view!!.findViewById(R.id.__dt_canary_row_text) as TextView
+            val textView = view!!.findViewById<TextView>(R.id.__dt_canary_row_text)
             textView.text = context.packageName
         } else {
             if (view == null) {
                 view = LayoutInflater.from(context).inflate(R.layout.__dt_canary_ref_row, parent, false)
             }
-            val textView = view!!.findViewById(R.id.__dt_canary_row_text) as TextView
+            val textView = view!!.findViewById<TextView>(R.id.__dt_canary_row_text)
 
             val element = getItem(position)
             val htmlString = elementToHtmlString(element, position, mFoldings[position - 1])
             textView.text = Html.fromHtml(htmlString)
 
-            val connectorView = view.findViewById(R.id.__dt_canary_row_connector) as __DisplayLeakConnectorView
+            val connectorView = view.findViewById<__DisplayLeakConnectorView>(R.id.__dt_canary_row_connector)
             connectorView.setType(connectorViewType(position))
 
-            val moreDetailsView = view.findViewById(R.id.__dt_canary_row_more) as __MoreDetailsView
+            val moreDetailsView = view.findViewById<__MoreDetailsView>(R.id.__dt_canary_row_more)
             moreDetailsView.setFolding(mFoldings[position - 1])
         }
 
@@ -116,10 +116,10 @@ internal class CrashBlockDetailAdapter: BaseAdapter() {
 
     companion object {
 
-        private val TOP_ROW = 0
-        private val NORMAL_ROW = 1
+        private const val TOP_ROW = 0
+        private const val NORMAL_ROW = 1
 
-        private val POSITION_THREAD = 1
-        private val POSITION_STACKTRACE = 2
+        private const val POSITION_THREAD = 1
+        private const val POSITION_STACKTRACE = 2
     }
 }
\ No newline at end of file
diff --git a/components/src/main/kotlin/com/exyui/android/debugbottle/components/dialog/__QuickDialog.kt b/components/src/main/kotlin/com/exyui/android/debugbottle/components/dialog/__QuickDialog.kt
index 7a36010..2d01797 100644
--- a/components/src/main/kotlin/com/exyui/android/debugbottle/components/dialog/__QuickDialog.kt
+++ b/components/src/main/kotlin/com/exyui/android/debugbottle/components/dialog/__QuickDialog.kt
@@ -14,7 +14,7 @@ import com.exyui.android.debugbottle.components.widgets.__FloatingDialogHeaderLa
 class __QuickDialog : __FloatAnimatedDialog() {
 
     companion object {
-        val TAG = "__QuickDialog"
+        const val TAG = "__QuickDialog"
     }
     override val TAG = __QuickDialog.TAG
     override val title = R.string.__dt_bottle
@@ -22,20 +22,20 @@ class __QuickDialog : __FloatAnimatedDialog() {
     private var rootView: ViewGroup? = null
     private var currentPanel: View? = null
     private val container by lazy {
-        rootView?.findViewById(R.id.__dt_container) as ViewGroup
+        rootView?.findViewById<ViewGroup>(R.id.__dt_container)!!
     }
 
     private val mainView by lazy {
-        container.findViewById(R.id.__dt_quick_main) as __QuickDialogMainView
+        container.findViewById<__QuickDialogMainView>(R.id.__dt_quick_main)
     }
 
     private val togglesView by lazy {
-        container.findViewById(R.id.__dt_quick_toggle) as ViewGroup
+        container.findViewById<ViewGroup>(R.id.__dt_quick_toggle)
     }
 
     override fun createView(): View {
         return activity.layoutInflater.inflate(R.layout.__dialog_toggles, null).apply {
-            (findViewById(R.id.__floating_header) as __FloatingDialogHeaderLayout?)?.let { header ->
+            findViewById<__FloatingDialogHeaderLayout?>(R.id.__floating_header)?.let { header ->
                 header.setAction {
                     if (togglesView sameAs currentPanel) {
                         container.show(mainView)
@@ -47,8 +47,8 @@ class __QuickDialog : __FloatAnimatedDialog() {
                 }
                 header.setClose { dismiss() }
             }
-            findViewById(R.id.__dt_open).setOnClickListener { startDTDrawerActivity() }
-            findViewById(R.id.__dt_help).setOnClickListener { help() }
+            findViewById<View>(R.id.__dt_open).setOnClickListener { startDTDrawerActivity() }
+            findViewById<View>(R.id.__dt_help).setOnClickListener { help() }
             this@__QuickDialog.rootView = this as ViewGroup
             bindViews()
             isCancelable = true
@@ -59,10 +59,6 @@ class __QuickDialog : __FloatAnimatedDialog() {
         }
     }
 
-    override fun onDestroyView() {
-        super.onDestroyView()
-    }
-
     private fun bindViews() {
 
     }
diff --git a/components/src/main/kotlin/com/exyui/android/debugbottle/components/dialog/__TestingPreStartDialog.kt b/components/src/main/kotlin/com/exyui/android/debugbottle/components/dialog/__TestingPreStartDialog.kt
index cb9c2c9..435e267 100644
--- a/components/src/main/kotlin/com/exyui/android/debugbottle/components/dialog/__TestingPreStartDialog.kt
+++ b/components/src/main/kotlin/com/exyui/android/debugbottle/components/dialog/__TestingPreStartDialog.kt
@@ -38,15 +38,15 @@ class __TestingPreStartDialog : __FloatAnimatedDialog() {
     override fun createView(): View {
         __TestingRunnerBubble.destroy(activity)
         return activity.layoutInflater.inflate(R.layout.__dialog_prestart_testing, null).apply {
-            (findViewById(R.id.__floating_header) as __FloatingDialogHeaderLayout).let { header ->
+            findViewById<__FloatingDialogHeaderLayout>(R.id.__floating_header).let { header ->
                 header.setAction { openSettings() }
                 header.setClose { close() }
             }
-            findViewById(R.id.__dt_apply_and_restart).setOnClickListener {
+            findViewById<View>(R.id.__dt_apply_and_restart).setOnClickListener {
                 startTestingEnvironment()
                 DTInstaller.kill()
             }
-            findViewById(R.id.__dt_run_test).setOnClickListener { startTestingEnvironment() }
+            findViewById<View>(R.id.__dt_run_test).setOnClickListener { startTestingEnvironment() }
             isCancelable = false
             this@__TestingPreStartDialog.rootView = this
             bindViews()
diff --git a/components/src/main/kotlin/com/exyui/android/debugbottle/components/dialog/__UnlockDialog.kt b/components/src/main/kotlin/com/exyui/android/debugbottle/components/dialog/__UnlockDialog.kt
index bcba335..4e95cda 100644
--- a/components/src/main/kotlin/com/exyui/android/debugbottle/components/dialog/__UnlockDialog.kt
+++ b/components/src/main/kotlin/com/exyui/android/debugbottle/components/dialog/__UnlockDialog.kt
@@ -18,7 +18,7 @@ import com.exyui.android.debugbottle.components.widgets.__FloatingDialogHeaderLa
 class __UnlockDialog: __FloatAnimatedDialog() {
 
     companion object {
-        val TAG = "__UnlockDialog"
+        const val TAG = "__UnlockDialog"
     }
 
     override val TAG = __UnlockDialog.TAG
@@ -27,12 +27,12 @@ class __UnlockDialog: __FloatAnimatedDialog() {
     private val code = generateCode().toString()
 
     private var rootView: ViewGroup? = null
-    private val numberView by lazy { rootView?.findViewById(R.id.__dt_number) as TextView }
-    private val inputView by lazy { rootView?.findViewById(R.id.__dt_input) as EditText }
+    private val numberView by lazy { rootView?.findViewById<TextView>(R.id.__dt_number)!! }
+    private val inputView by lazy { rootView?.findViewById<EditText>(R.id.__dt_input)!! }
 
     override fun createView(): View {
         return activity.layoutInflater.inflate(R.layout.__dialog_unlock, null).apply {
-            (findViewById(R.id.__floating_header) as __FloatingDialogHeaderLayout).let { header ->
+            findViewById<__FloatingDialogHeaderLayout>(R.id.__floating_header).let { header ->
                 header.setAction { Toast.makeText(activity, R.string.__dt_notification_locked, Toast.LENGTH_SHORT).show() }
                 header.setClose { dismiss() }
             }
diff --git a/components/src/main/kotlin/com/exyui/android/debugbottle/components/dialog/quickviews/__QuickDialogItemView.kt b/components/src/main/kotlin/com/exyui/android/debugbottle/components/dialog/quickviews/__QuickDialogItemView.kt
index 35747bf..e5471a0 100644
--- a/components/src/main/kotlin/com/exyui/android/debugbottle/components/dialog/quickviews/__QuickDialogItemView.kt
+++ b/components/src/main/kotlin/com/exyui/android/debugbottle/components/dialog/quickviews/__QuickDialogItemView.kt
@@ -24,8 +24,8 @@ constructor(
         defStyleRes: Int = 0)
     : RelativeLayout(context, attr, defStyleAttr, defStyleRes) {
 
-    private val titleView by lazy { findViewById(R.id.__dt_title) as TextView }
-    private val contentView by lazy { findViewById(R.id.__dt_description) as TextView }
+    private val titleView by lazy { findViewById<TextView>(R.id.__dt_title)!! }
+    private val contentView by lazy { findViewById<TextView>(R.id.__dt_description)!! }
 
     var title: CharSequence
         set(value) {
diff --git a/components/src/main/kotlin/com/exyui/android/debugbottle/components/dialog/quickviews/__QuickDialogMainView.kt b/components/src/main/kotlin/com/exyui/android/debugbottle/components/dialog/quickviews/__QuickDialogMainView.kt
index 435bded..0dc92a6 100644
--- a/components/src/main/kotlin/com/exyui/android/debugbottle/components/dialog/quickviews/__QuickDialogMainView.kt
+++ b/components/src/main/kotlin/com/exyui/android/debugbottle/components/dialog/quickviews/__QuickDialogMainView.kt
@@ -1,12 +1,7 @@
 package com.exyui.android.debugbottle.components.dialog.quickviews
 
-import android.annotation.SuppressLint
-import android.annotation.TargetApi
 import android.app.Activity
 import android.content.Context
-import android.content.Intent
-import android.net.Uri
-import android.os.Build
 import android.util.AttributeSet
 import android.view.View
 import android.view.ViewGroup
@@ -18,41 +13,21 @@ import com.exyui.android.debugbottle.components.openInBrowser
 /**
  * Created by yuriel on 10/13/16.
  */
-class __QuickDialogMainView: ScrollView {
+class __QuickDialogMainView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0) : ScrollView(context, attrs, defStyleAttr) {
 
-    private val rootChild by lazy { findViewById(R.id.__dt_content) as ViewGroup }
+    private val rootChild by lazy { findViewById<ViewGroup>(R.id.__dt_content)!! }
     private val emptyView by lazy {
-        findViewById(R.id.__dt_empty).apply {
+        findViewById<View>(R.id.__dt_empty).apply {
             setOnClickListener {
                 val url = "https://github.com/kiruto/debug-bottle/blob/1.0.1/demo/src/main/kotlin/me/chunyu/dev/yuriel/kotdebugtool/ContentInjector.kt"
                 (context as Activity).openInBrowser(url)
             }
         }
     }
-    private val contents by lazy { findViewById(R.id.__dt_content) }
+    private val contents by lazy { findViewById<View>(R.id.__dt_content) }
     private val cb:MutableList<(View) -> Unit> = mutableListOf()
 
-    constructor(context: Context): super(context) {
-        init()
-    }
-
-    constructor(context: Context, attr: AttributeSet): super(context, attr) {
-        init()
-    }
-
-    constructor(context: Context, attr: AttributeSet, defStyleAttr: Int): super(context, attr, defStyleAttr) {
-        init()
-    }
-
-    @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
-    constructor(context: Context,
-                attr: AttributeSet?,
-                defStyleAttr: Int,
-                defStyleRes: Int) : super(context, attr, defStyleAttr, defStyleRes) {
-        init()
-    }
-
-    private fun init() {
+    init {
         bindViews()
     }
 
diff --git a/components/src/main/kotlin/com/exyui/android/debugbottle/components/dialog/quickviews/__QuickDialogTogglesView.kt b/components/src/main/kotlin/com/exyui/android/debugbottle/components/dialog/quickviews/__QuickDialogTogglesView.kt
index 22a1a4d..5e99985 100644
--- a/components/src/main/kotlin/com/exyui/android/debugbottle/components/dialog/quickviews/__QuickDialogTogglesView.kt
+++ b/components/src/main/kotlin/com/exyui/android/debugbottle/components/dialog/quickviews/__QuickDialogTogglesView.kt
@@ -93,7 +93,7 @@ class __QuickDialogTogglesView: ScrollView {
     private fun onReceiveBubbleIntent(context: Context, intent: Intent?) {
         when(intent?.extras?.getString(__DTBubble.KEY_TAG)) {
             __3DViewBubble.TAG -> {
-                val bubble3DStatus = intent?.extras?.getBoolean(__DTBubble.KEY_IS_RUNNING)?: false
+                val bubble3DStatus = intent.extras?.getBoolean(__DTBubble.KEY_IS_RUNNING)?: false
                 view3DSwitcher?.isChecked = bubble3DStatus
             }
         }
diff --git a/components/src/main/kotlin/com/exyui/android/debugbottle/components/floating/DTDragFloatingViewMgr.kt b/components/src/main/kotlin/com/exyui/android/debugbottle/components/floating/DTDragFloatingViewMgr.kt
index 2b98746..593c98c 100644
--- a/components/src/main/kotlin/com/exyui/android/debugbottle/components/floating/DTDragFloatingViewMgr.kt
+++ b/components/src/main/kotlin/com/exyui/android/debugbottle/components/floating/DTDragFloatingViewMgr.kt
@@ -45,8 +45,8 @@ internal abstract class DTDragFloatingViewMgr {
             val inflater = LayoutInflater.from(context?.applicationContext)
 
             val root = inflater.inflate(R.layout.__dt_float_layout, null) as ViewGroup
-            val action = root.findViewById(R.id.__dt_float_obj) as Button
-            val drag = root.findViewById(R.id.__dt_drag)
+            val action = root.findViewById<Button>(R.id.__dt_float_obj)
+            val drag = root.findViewById<View>(R.id.__dt_drag)
 
 
             windowMgr?.addView(root, it)
diff --git a/components/src/main/kotlin/com/exyui/android/debugbottle/components/floating/frame/__FloatFrame.kt b/components/src/main/kotlin/com/exyui/android/debugbottle/components/floating/frame/__FloatFrame.kt
index e87907e..2977278 100644
--- a/components/src/main/kotlin/com/exyui/android/debugbottle/components/floating/frame/__FloatFrame.kt
+++ b/components/src/main/kotlin/com/exyui/android/debugbottle/components/floating/frame/__FloatFrame.kt
@@ -1,5 +1,6 @@
 package com.exyui.android.debugbottle.components.floating.frame
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.graphics.Color
 import android.graphics.PixelFormat
@@ -14,6 +15,7 @@ import java.text.DecimalFormat
 /**
  * Created by yuriel on 9/30/16.
  */
+@SuppressLint("StaticFieldLeak")
 internal object __FloatFrame {
     private val TAG = "__FloatFrame"
 
@@ -87,8 +89,8 @@ internal object __FloatFrame {
     }
 
     private fun bindViews() {
-        frameView = rootView?.findViewById(R.id.__dt_frame) as TextView
-        statusView = rootView?.findViewById(R.id.__dt_status) as TextView
+        frameView = rootView?.findViewById(R.id.__dt_frame)
+        statusView = rootView?.findViewById(R.id.__dt_status)
     }
 
     private fun TextView.warn() {
diff --git a/components/src/main/kotlin/com/exyui/android/debugbottle/components/fragments/__ContentFragment.kt b/components/src/main/kotlin/com/exyui/android/debugbottle/components/fragments/__ContentFragment.kt
index 6ed2772..5132a68 100644
--- a/components/src/main/kotlin/com/exyui/android/debugbottle/components/fragments/__ContentFragment.kt
+++ b/components/src/main/kotlin/com/exyui/android/debugbottle/components/fragments/__ContentFragment.kt
@@ -50,11 +50,11 @@ open class __ContentFragment: Fragment() {
     protected fun registerBubbleStatusChangeReceiver() {
         val filter = IntentFilter()
         filter.addAction(__DTBubble.INTENT_ACTION)
-        activity.registerReceiver(bubbleStatusChangeReceiver, filter)
+        activity?.registerReceiver(bubbleStatusChangeReceiver, filter)
     }
 
     protected fun unregisterBubbleStatusChangeReceiver() {
-        activity.unregisterReceiver(bubbleStatusChangeReceiver)
+        activity?.unregisterReceiver(bubbleStatusChangeReceiver)
     }
 
     fun selectItemAtDrawer(@StringRes res: Int) {
diff --git a/components/src/main/kotlin/com/exyui/android/debugbottle/components/fragments/__DisplayBlockFragment.kt b/components/src/main/kotlin/com/exyui/android/debugbottle/components/fragments/__DisplayBlockFragment.kt
index 9544da5..8c91546 100644
--- a/components/src/main/kotlin/com/exyui/android/debugbottle/components/fragments/__DisplayBlockFragment.kt
+++ b/components/src/main/kotlin/com/exyui/android/debugbottle/components/fragments/__DisplayBlockFragment.kt
@@ -1,5 +1,6 @@
 package com.exyui.android.debugbottle.components.fragments
 
+import android.annotation.SuppressLint
 import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
@@ -72,7 +73,7 @@ class __DisplayBlockFragment: __ContentFragment() {
         } else {
             val intent = context?.intent
             if (intent?.hasExtra(SHOW_BLOCK_EXTRA) == true) {
-                mBlockStartTime = intent?.getStringExtra(SHOW_BLOCK_EXTRA)
+                mBlockStartTime = intent.getStringExtra(SHOW_BLOCK_EXTRA)
             }
         }
         setHasOptionsMenu(true)
@@ -254,13 +255,14 @@ class __DisplayBlockFragment: __ContentFragment() {
 
         override fun getItemId(position: Int): Long = position.toLong()
 
+        @SuppressLint("StringFormatMatches")
         override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
             var view = convertView
             if (view == null) {
                 view = LayoutInflater.from(context).inflate(R.layout.__dt_canary_block_row, parent, false)
             }
-            val titleView = view!!.findViewById(R.id.__dt_canary_row_text) as TextView
-            val timeView = view.findViewById(R.id.__dt_canary_row_time) as TextView
+            val titleView = view!!.findViewById<TextView>(R.id.__dt_canary_row_text)
+            val timeView = view.findViewById<TextView>(R.id.__dt_canary_row_time)
             val block = getItem(position)
 
             val index: String = if (position == 0 && mBlockEntries.size == mMaxStoredBlockCount) {
@@ -346,13 +348,13 @@ class __DisplayBlockFragment: __ContentFragment() {
                 if (view == null) {
                     view = LayoutInflater.from(context).inflate(R.layout.__dt_canary_ref_top_row, parent, false)
                 }
-                val textView = view!!.findViewById(R.id.__dt_canary_row_text) as TextView
+                val textView = view!!.findViewById<TextView>(R.id.__dt_canary_row_text)
                 textView.text = context.packageName
             } else {
                 if (view == null) {
                     view = LayoutInflater.from(context).inflate(R.layout.__dt_canary_ref_row, parent, false)
                 }
-                val textView = view!!.findViewById(R.id.__dt_canary_row_text) as TextView
+                val textView = view!!.findViewById<TextView>(R.id.__dt_canary_row_text)
 
                 val isThreadStackEntry = position == POSITION_THREAD_STACK + 1
                 val element = getItem(position)
@@ -362,10 +364,10 @@ class __DisplayBlockFragment: __ContentFragment() {
                 }
                 textView.text = Html.fromHtml(htmlString)
 
-                val connectorView = view.findViewById(R.id.__dt_canary_row_connector) as __DisplayLeakConnectorView
+                val connectorView = view.findViewById<__DisplayLeakConnectorView>(R.id.__dt_canary_row_connector)
                 connectorView.setType(connectorViewType(position))
 
-                val moreDetailsView = view.findViewById(R.id.__dt_canary_row_more) as __MoreDetailsView
+                val moreDetailsView = view.findViewById<__MoreDetailsView>(R.id.__dt_canary_row_more)
                 moreDetailsView.setFolding(mFoldings[position])
             }
 
@@ -477,13 +479,13 @@ class __DisplayBlockFragment: __ContentFragment() {
 
         companion object {
 
-            private val TOP_ROW = 0
-            private val NORMAL_ROW = 1
+            private const val TOP_ROW = 0
+            private const val NORMAL_ROW = 1
 
-            private val POSITION_BASIC = 1
-            private val POSITION_TIME = 2
-            private val POSITION_CPU = 3
-            private val POSITION_THREAD_STACK = 4
+            private const val POSITION_BASIC = 1
+            private const val POSITION_TIME = 2
+            private const val POSITION_CPU = 3
+            private const val POSITION_THREAD_STACK = 4
         }
     }
 
diff --git a/components/src/main/kotlin/com/exyui/android/debugbottle/components/fragments/__DisplayCrashBlockFragment.kt b/components/src/main/kotlin/com/exyui/android/debugbottle/components/fragments/__DisplayCrashBlockFragment.kt
index 112cc47..c6b8cdc 100644
--- a/components/src/main/kotlin/com/exyui/android/debugbottle/components/fragments/__DisplayCrashBlockFragment.kt
+++ b/components/src/main/kotlin/com/exyui/android/debugbottle/components/fragments/__DisplayCrashBlockFragment.kt
@@ -244,9 +244,9 @@ class __DisplayCrashBlockFragment: __ContentFragment() {
             if (view == null) {
                 view = LayoutInflater.from(context).inflate(R.layout.__dt_canary_block_row, parent, false)
             }
-            val titleView = view!!.findViewById(R.id.__dt_canary_row_text) as TextView
+            val titleView = view!!.findViewById<TextView>(R.id.__dt_canary_row_text)
             @Suppress("UNUSED_VARIABLE")
-            val timeView = view.findViewById(R.id.__dt_canary_row_time) as TextView
+            val timeView = view.findViewById<TextView>(R.id.__dt_canary_row_time)
             val block = getItem(position)
 
             val index: String = if (position == 0 && mBlockEntries.size == mMaxStoredBlockCount) {
diff --git a/components/src/main/kotlin/com/exyui/android/debugbottle/components/fragments/__DisplayHttpBlockFragment.kt b/components/src/main/kotlin/com/exyui/android/debugbottle/components/fragments/__DisplayHttpBlockFragment.kt
index f2b96ac..5556aa5 100644
--- a/components/src/main/kotlin/com/exyui/android/debugbottle/components/fragments/__DisplayHttpBlockFragment.kt
+++ b/components/src/main/kotlin/com/exyui/android/debugbottle/components/fragments/__DisplayHttpBlockFragment.kt
@@ -66,7 +66,7 @@ class __DisplayHttpBlockFragment: __ContentFragment() {
         } else {
             val intent = context?.intent
             if (intent?.hasExtra(SHOW_BLOCK_EXTRA) == true) {
-                mBlockStartTime = intent!!.getStringExtra(SHOW_BLOCK_EXTRA)
+                mBlockStartTime = intent.getStringExtra(SHOW_BLOCK_EXTRA)
             }
         }
 
@@ -249,8 +249,8 @@ class __DisplayHttpBlockFragment: __ContentFragment() {
             if (view == null) {
                 view = LayoutInflater.from(context).inflate(R.layout.__dt_canary_block_row, parent, false)
             }
-            val titleView = view!!.findViewById(R.id.__dt_canary_row_text) as TextView
-            val timeView = view.findViewById(R.id.__dt_canary_row_time) as TextView
+            val titleView = view!!.findViewById<TextView>(R.id.__dt_canary_row_text)
+            val timeView = view.findViewById<TextView>(R.id.__dt_canary_row_time)
             val block = getItem(position)
 
             val index: String = if (position == 0 && mBlockEntries.size == mMaxStoredBlockCount) {
diff --git a/components/src/main/kotlin/com/exyui/android/debugbottle/components/fragments/__InjectorFragment.kt b/components/src/main/kotlin/com/exyui/android/debugbottle/components/fragments/__InjectorFragment.kt
index e16f71b..e1d9026 100644
--- a/components/src/main/kotlin/com/exyui/android/debugbottle/components/fragments/__InjectorFragment.kt
+++ b/components/src/main/kotlin/com/exyui/android/debugbottle/components/fragments/__InjectorFragment.kt
@@ -38,7 +38,7 @@ class __InjectorFragment: __ContentFragment() {
     }
 
     private val type: Int by lazy {
-        arguments.getInt(TYPE, TYPE_ALL_ACTIVITIES)
+        arguments!!.getInt(TYPE, TYPE_ALL_ACTIVITIES)
     }
 
     private val adapter by lazy {
diff --git a/components/src/main/kotlin/com/exyui/android/debugbottle/components/fragments/__SPViewerFragment.kt b/components/src/main/kotlin/com/exyui/android/debugbottle/components/fragments/__SPViewerFragment.kt
index 32f70ac..f5cd8c0 100644
--- a/components/src/main/kotlin/com/exyui/android/debugbottle/components/fragments/__SPViewerFragment.kt
+++ b/components/src/main/kotlin/com/exyui/android/debugbottle/components/fragments/__SPViewerFragment.kt
@@ -71,8 +71,8 @@ class __SPViewerFragment: __ContentFragment(), DialogsCollection.SPDialogAction
             if (null == v) {
                 v = LayoutInflater.from(context).inflate(R.layout.__child_sp_values, parent, false)
                 holder = ChildHolder()
-                holder.titleView = v.findViewById(R.id.__child_title) as TextView
-                holder.contentView = v.findViewById(R.id.__child_content) as TextView
+                holder.titleView = v.findViewById(R.id.__child_title)
+                holder.contentView = v.findViewById(R.id.__child_content)
                 v.tag = holder
             } else {
                 holder = v.tag as ChildHolder
@@ -96,7 +96,7 @@ class __SPViewerFragment: __ContentFragment(), DialogsCollection.SPDialogAction
             if (null == v) {
                 v = LayoutInflater.from(context).inflate(R.layout.__group_sp_files, parent, false)
                 holder = GroupHolder()
-                holder.titleView = v.findViewById(R.id.group_title) as TextView
+                holder.titleView = v.findViewById(R.id.group_title)
                 v.tag = holder
             } else {
                 holder = v.tag as GroupHolder
diff --git a/components/src/main/kotlin/com/exyui/android/debugbottle/components/fragments/__SettingsFragment.kt b/components/src/main/kotlin/com/exyui/android/debugbottle/components/fragments/__SettingsFragment.kt
index 7bbcd4c..4e972cc 100644
--- a/components/src/main/kotlin/com/exyui/android/debugbottle/components/fragments/__SettingsFragment.kt
+++ b/components/src/main/kotlin/com/exyui/android/debugbottle/components/fragments/__SettingsFragment.kt
@@ -119,7 +119,7 @@ class __SettingsFragment: __ContentFragment() {
         Toast.makeText(context, R.string.__dt_need_restart_after_apply, Toast.LENGTH_LONG).show()
     }
 
-    private fun findViewById(@IdRes id: Int) = rootView?.findViewById(id)
+    private fun findViewById(@IdRes id: Int) = rootView?.findViewById<View>(id)
 
     private fun save() {
         DTSettings.blockThreshold = seekBar.progress.toLong()
diff --git a/components/src/main/kotlin/com/exyui/android/debugbottle/components/fragments/__StatusFragment.kt b/components/src/main/kotlin/com/exyui/android/debugbottle/components/fragments/__StatusFragment.kt
index 0b5848b..605ed8c 100644
--- a/components/src/main/kotlin/com/exyui/android/debugbottle/components/fragments/__StatusFragment.kt
+++ b/components/src/main/kotlin/com/exyui/android/debugbottle/components/fragments/__StatusFragment.kt
@@ -1,21 +1,17 @@
 package com.exyui.android.debugbottle.components.fragments
 
 import android.Manifest
-import android.annotation.TargetApi
-import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import android.content.IntentFilter
 import android.content.pm.PackageManager
 import android.graphics.Color
 import android.net.Uri
-import android.os.*
-import android.provider.Settings
+import android.os.Bundle
+import android.os.Process
 import android.support.annotation.IdRes
 import android.support.v4.app.ActivityCompat
 import android.support.v4.content.ContextCompat
 import android.support.v7.app.AlertDialog
-import android.support.v7.widget.SwitchCompat
 import android.view.*
 import android.widget.TextView
 import com.exyui.android.debugbottle.components.*
@@ -76,9 +72,9 @@ class __StatusFragment: __ContentFragment() {
                     this.isChecked = false
                 } else {
                     if (isChecked) {
-                        __3DViewBubble.create(activity)
+                        __3DViewBubble.create(activity!!)
                     } else {
-                        __3DViewBubble.destroy(activity)
+                        __3DViewBubble.destroy(activity!!)
                     }
                 }
             }
@@ -91,9 +87,9 @@ class __StatusFragment: __ContentFragment() {
             setOnCheckedChangeListener { _, isChecked ->
                 DTSettings.frameEnable = isChecked
                 if (isChecked) {
-                    __FloatFrame.start(activity)
+                    __FloatFrame.start(activity!!)
                 } else {
-                    __FloatFrame.stop(activity)
+                    __FloatFrame.stop(activity!!)
                 }
             }
         }
@@ -165,7 +161,7 @@ class __StatusFragment: __ContentFragment() {
     override fun onReceiveBubbleIntent(context: Context, intent: Intent?) {
         when(intent?.extras?.getString(__DTBubble.KEY_TAG)) {
             __3DViewBubble.TAG -> {
-                val bubble3DStatus = intent?.extras?.getBoolean(__DTBubble.KEY_IS_RUNNING)?: false
+                val bubble3DStatus = intent.extras?.getBoolean(__DTBubble.KEY_IS_RUNNING)?: false
                 view3DSwitcher.isChecked = bubble3DStatus
             }
         }
@@ -175,14 +171,14 @@ class __StatusFragment: __ContentFragment() {
         menu.add(R.string.__dt_close)
                 .setIcon(R.drawable.__ic_close_black_24dp)
                 .setOnMenuItemClickListener {
-                    activity.finish()
+                    activity?.finish()
                     true
                 }
                 .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS)
     }
 
     private fun showNeedPermissionsDialog() {
-        AlertDialog.Builder(context)
+        AlertDialog.Builder(context!!)
                 .setTitle(R.string.__dt_need_permissions)
                 .setMessage(R.string.__dt_permission_message)
                 .setNegativeButton(R.string.__dt_not_now) { _, _ -> }
@@ -193,7 +189,7 @@ class __StatusFragment: __ContentFragment() {
     }
 
     private fun showNeedEnableDialog() {
-        AlertDialog.Builder(context)
+        AlertDialog.Builder(context!!)
                 .setIcon(R.drawable.__dt_ic_bottle_24dp)
                 .setTitle(R.string.__dt_need_enable_dt)
                 .setMessage(R.string.__dt_enable_dt_message)
@@ -208,7 +204,7 @@ class __StatusFragment: __ContentFragment() {
     }
 
     private fun showNeedKillProcDialog() {
-        AlertDialog.Builder(context)
+        AlertDialog.Builder(context!!)
                 .setMessage(R.string.__dt_need_kill_proc)
                 .setNegativeButton(R.string.__dt_later) { _, _ -> }
                 .setPositiveButton(R.string.__dt_kill_process) { _, _ ->
diff --git a/components/src/main/kotlin/com/exyui/android/debugbottle/components/fragments/__TestSettingsFragment.kt b/components/src/main/kotlin/com/exyui/android/debugbottle/components/fragments/__TestSettingsFragment.kt
index 86282cb..5ba9ae7 100644
--- a/components/src/main/kotlin/com/exyui/android/debugbottle/components/fragments/__TestSettingsFragment.kt
+++ b/components/src/main/kotlin/com/exyui/android/debugbottle/components/fragments/__TestSettingsFragment.kt
@@ -1,6 +1,5 @@
 package com.exyui.android.debugbottle.components.fragments
 
-import android.app.Activity
 import android.app.AlertDialog
 import android.app.Dialog
 import android.content.Context
@@ -11,7 +10,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ArrayAdapter
-import android.widget.Toast
 import com.exyui.android.debugbottle.components.R
 import com.exyui.android.debugbottle.components.RunningFeatureMgr
 import com.exyui.android.debugbottle.components.bubbles.services.__DTBubble
@@ -28,20 +26,20 @@ class __TestSettingsFragment: __ContentFragment() {
     private lateinit var rootView: View
 
     private val testCtrlView: DTListItemSwitch by lazy {
-        (rootView.findViewById(R.id.__dt_testing_enable) as DTListItemSwitch).apply {
+        rootView.findViewById<DTListItemSwitch>(R.id.__dt_testing_enable).apply {
             isChecked = RunningFeatureMgr.has(RunningFeatureMgr.STRESS_TEST_RUNNER)
             setOnCheckedChangeListener { _, isChecked ->
                 if (isChecked) {
-                    __TestingRunnerBubble.create(activity)
+                    __TestingRunnerBubble.create(activity!!)
                 } else {
-                    __TestingRunnerBubble.destroy(activity)
+                    __TestingRunnerBubble.destroy(activity!!)
                 }
             }
         }
     }
 
     private val showBlacklistView: ViewGroup by lazy {
-        (rootView.findViewById(R.id.__dt_show_list) as ViewGroup).apply {
+        rootView.findViewById<ViewGroup>(R.id.__dt_show_list).apply {
             setOnClickListener {
                 MonkeyBlackListDialog().show(childFragmentManager, TAG)
             }
@@ -67,7 +65,7 @@ class __TestSettingsFragment: __ContentFragment() {
     override fun onReceiveBubbleIntent(context: Context, intent: Intent?) {
         when(intent?.extras?.getString(__DTBubble.KEY_TAG)) {
             __TestingRunnerBubble.TAG -> {
-                val bubble3DStatus = intent?.extras?.getBoolean(__DTBubble.KEY_IS_RUNNING)?: false
+                val bubble3DStatus = intent.extras?.getBoolean(__DTBubble.KEY_IS_RUNNING)?: false
                 testCtrlView.isChecked = bubble3DStatus
             }
         }
@@ -92,9 +90,7 @@ class __TestSettingsFragment: __ContentFragment() {
             }.create()
         }
 
-        @Suppress("OverridingDeprecatedMember")
-        override fun onAttach(context: Activity?) {
-            @Suppress("DEPRECATION")
+        override fun onAttach(context: Context?) {
             super.onAttach(context)
             context?.let { activityContext = it }
         }
diff --git a/components/src/main/kotlin/com/exyui/android/debugbottle/components/fragments/__WebViewFragment.kt b/components/src/main/kotlin/com/exyui/android/debugbottle/components/fragments/__WebViewFragment.kt
index 262b926..4ca3e3d 100644
--- a/components/src/main/kotlin/com/exyui/android/debugbottle/components/fragments/__WebViewFragment.kt
+++ b/components/src/main/kotlin/com/exyui/android/debugbottle/components/fragments/__WebViewFragment.kt
@@ -31,8 +31,8 @@ class __WebViewFragment: __ContentFragment(), View.OnClickListener {
     private var urlBar: ViewGroup? = null
 
     companion object {
-        private val TAG = "__WebViewFragment"
-        private val URL = "url"
+        private const val TAG = "__WebViewFragment"
+        private const val URL = "url"
 
         fun newInstance(url: String): __WebViewFragment {
             return __WebViewFragment().apply {
@@ -45,22 +45,22 @@ class __WebViewFragment: __ContentFragment(), View.OnClickListener {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        url = arguments.getString(URL)
+        url = arguments?.getString(URL)
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         return inflater.inflate(R.layout.__fragment_web_view, container, false).apply {
-            webView = findViewById(R.id.__dt_web_view) as WebView
-            addressView = findViewById(R.id.__dt_address) as TextView
+            webView = findViewById(R.id.__dt_web_view)
+            addressView = findViewById(R.id.__dt_address)
             backView = findViewById(R.id.__dt_back)
             refreshView = findViewById(R.id.__dt_refresh)
-            urlBar = findViewById(R.id.__dt_url_bar) as ViewGroup
+            urlBar = findViewById(R.id.__dt_url_bar)
 
             addressView?.setOnClickListener(this@__WebViewFragment)
             backView?.setOnClickListener(this@__WebViewFragment)
             refreshView?.setOnClickListener(this@__WebViewFragment)
 
-            webView?.setWebViewClient(DTWebViewClient())
+            webView?.webViewClient = DTWebViewClient()
             webView?.settings?.javaScriptEnabled = true
             webView?.load(url)
 
@@ -119,7 +119,7 @@ class __WebViewFragment: __ContentFragment(), View.OnClickListener {
     }
 
     private fun copyUrlToClipboard() {
-        val clipboard = activity.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
+        val clipboard = activity?.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
         val clip = ClipData.newPlainText(URL, url)
         clipboard.primaryClip = clip
         Toast.makeText(activity, R.string.__dt_copied, Toast.LENGTH_SHORT).show()
diff --git a/components/src/main/kotlin/com/exyui/android/debugbottle/components/fragments/components/switchers.kt b/components/src/main/kotlin/com/exyui/android/debugbottle/components/fragments/components/switchers.kt
index 0e9b570..dc15bbd 100644
--- a/components/src/main/kotlin/com/exyui/android/debugbottle/components/fragments/components/switchers.kt
+++ b/components/src/main/kotlin/com/exyui/android/debugbottle/components/fragments/components/switchers.kt
@@ -19,7 +19,7 @@ import com.exyui.android.debugbottle.ui.BlockCanary
  * Created by yuriel on 10/12/16.
  */
 internal fun View.networkSwitcher(@IdRes id: Int): DTListItemSwitch {
-    return (findViewById(id) as DTListItemSwitch).apply {
+    return findViewById<DTListItemSwitch>(id).apply {
         isChecked = DTSettings.networkSniff
         setOnCheckedChangeListener { _, isChecked ->
             DTSettings.networkSniff = isChecked
@@ -28,7 +28,7 @@ internal fun View.networkSwitcher(@IdRes id: Int): DTListItemSwitch {
 }
 
 internal fun View.strictSwitcher(@IdRes id: Int): DTListItemSwitch {
-    return (findViewById(id) as DTListItemSwitch).apply {
+    return findViewById<DTListItemSwitch>(id).apply {
         isChecked = DTSettings.strictMode
         setOnCheckedChangeListener { _, isChecked ->
             DTSettings.strictMode = isChecked
@@ -38,7 +38,7 @@ internal fun View.strictSwitcher(@IdRes id: Int): DTListItemSwitch {
 }
 
 internal fun View.view3DSwitcher(@IdRes id: Int): DTListItemSwitch {
-    return (findViewById(id) as DTListItemSwitch).apply {
+    return findViewById<DTListItemSwitch>(id).apply {
         val activity = context as Activity
         isChecked = __3DViewBubble.isRunning()
         setOnCheckedChangeListener { _, isChecked ->
@@ -61,7 +61,7 @@ internal fun View.view3DSwitcher(@IdRes id: Int): DTListItemSwitch {
 }
 
 internal fun View.leakCanarySwitcher(@IdRes id: Int): DTListItemSwitch {
-    return (findViewById(id) as DTListItemSwitch).apply {
+    return findViewById<DTListItemSwitch>(id).apply {
         isChecked = DTSettings.leakCanaryEnable
         setOnCheckedChangeListener { _, isChecked ->
             DTSettings.leakCanaryEnable = isChecked
@@ -71,21 +71,21 @@ internal fun View.leakCanarySwitcher(@IdRes id: Int): DTListItemSwitch {
 }
 
 internal fun View.blockCanarySwitcherCompat(@IdRes id: Int): SwitchCompat {
-    return (findViewById(id) as SwitchCompat).apply {
+    return findViewById<SwitchCompat>(id).apply {
         isChecked = DTSettings.blockCanaryEnable
         setOnCheckedChangeListener(::blockCanarySwitcherListener)
     }
 }
 
 internal fun View.blockCanarySwitcher(@IdRes id: Int): DTListItemSwitch {
-    return (findViewById(id) as DTListItemSwitch).apply {
+    return findViewById<DTListItemSwitch>(id).apply {
         isChecked = DTSettings.blockCanaryEnable
         setOnCheckedChangeListener(::blockCanarySwitcherListener)
     }
 }
 
 internal fun View.bottleSwitch(@IdRes id: Int): DTListItemSwitch {
-    return (findViewById(id) as DTListItemSwitch).apply {
+    return findViewById<DTListItemSwitch>(id).apply {
         isChecked = DTSettings.bottleEnable
         setOnCheckedChangeListener { _, isChecked ->
             DTSettings.bottleEnable = isChecked
@@ -95,7 +95,7 @@ internal fun View.bottleSwitch(@IdRes id: Int): DTListItemSwitch {
 }
 
 internal fun View.frameSwitcher(@IdRes id: Int): DTListItemSwitch {
-    return (findViewById(id) as DTListItemSwitch).apply {
+    return findViewById<DTListItemSwitch>(id).apply {
         val activity = context as Activity
         isChecked = DTSettings.frameEnable
         setOnCheckedChangeListener { _, isChecked ->
@@ -110,7 +110,7 @@ internal fun View.frameSwitcher(@IdRes id: Int): DTListItemSwitch {
 }
 
 internal fun View.monkeyBlackListSwitcher(@IdRes id: Int): DTListItemSwitch {
-    return (findViewById(id) as DTListItemSwitch).apply {
+    return findViewById<DTListItemSwitch>(id).apply {
         isChecked = DTSettings.monkeyBlacklist
         setOnCheckedChangeListener { _, isChecked ->
             DTSettings.monkeyBlacklist = isChecked
@@ -119,7 +119,7 @@ internal fun View.monkeyBlackListSwitcher(@IdRes id: Int): DTListItemSwitch {
 }
 
 internal fun View.notificationLockSwitcher(@IdRes id: Int): DTListItemSwitch {
-    return (findViewById(id) as DTListItemSwitch).apply {
+    return findViewById<DTListItemSwitch>(id).apply {
         isChecked = DTSettings.notificationLock
         setOnCheckedChangeListener { _, isChecked ->
             DTSettings.notificationLock = isChecked
diff --git a/components/src/main/kotlin/com/exyui/android/debugbottle/components/guide/IntroductionActivity.kt b/components/src/main/kotlin/com/exyui/android/debugbottle/components/guide/IntroductionActivity.kt
index 80133eb..d1da53f 100644
--- a/components/src/main/kotlin/com/exyui/android/debugbottle/components/guide/IntroductionActivity.kt
+++ b/components/src/main/kotlin/com/exyui/android/debugbottle/components/guide/IntroductionActivity.kt
@@ -22,29 +22,29 @@ internal class IntroductionActivity : AppCompatActivity() {
     private var theme: Int? = null
 
     private val pagerView by lazy {
-        (findViewById(R.id.__dt_view_pager) as ViewPager).apply {
+        findViewById<ViewPager>(R.id.__dt_view_pager).apply {
             adapter = IntroductionAdapter(supportFragmentManager)
             setPageTransformer(false, IntroductionTransformer())
         }
     }
 
-    private val contentView by lazy { findViewById(R.id.__dt_content_view) as ViewGroup }
+    private val contentView by lazy { findViewById<ViewGroup>(R.id.__dt_content_view) }
 
-    private val backgroundView by lazy { findViewById(R.id.__dt_background) as View }
+    private val backgroundView by lazy { findViewById<View>(R.id.__dt_background) }
 
     private val iconApp by lazy {
-        (findViewById(R.id.__dt_icon_app) as ImageView).apply {
+        findViewById<ImageView>(R.id.__dt_icon_app).apply {
             setImageDrawable(applicationInfo.loadIcon(packageManager))
         }
     }
 
-    private val iconArrow by lazy { findViewById(R.id.__dt_icon_arrow) as ImageView }
+    private val iconArrow by lazy { findViewById<ImageView>(R.id.__dt_icon_arrow) }
 
-    private val iconBottle by lazy { findViewById(R.id.__dt_icon_bottle) as ImageView }
+    private val iconBottle by lazy { findViewById<ImageView>(R.id.__dt_icon_bottle) }
 
-    private val textView by lazy { findViewById(R.id.__dt_intro_text) as ViewGroup }
+    private val textView by lazy { findViewById<ViewGroup>(R.id.__dt_intro_text) }
 
-    private val nextView by lazy { findViewById(R.id.__dt_intro_next) as TextView }
+    private val nextView by lazy { findViewById<TextView>(R.id.__dt_intro_next) }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -67,10 +67,6 @@ internal class IntroductionActivity : AppCompatActivity() {
         iconApp; iconArrow; iconBottle
     }
 
-    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
-    }
-
     private inner class IntroductionTransformer: ViewPager.PageTransformer {
         private val TAG = "IntroductionTransformer"
 
@@ -90,7 +86,7 @@ internal class IntroductionActivity : AppCompatActivity() {
 
         var done: Boolean? = null
 
-        override fun transformPage(view: View?, position: Float) {
+        override fun transformPage(view: View, position: Float) {
             if (position <= -1.0f || position >= 1.0f) {
 
                 // The page is not visible. This is a good place to stop
@@ -101,7 +97,7 @@ internal class IntroductionActivity : AppCompatActivity() {
                 // The page is selected. This is a good time to reset Views
                 // after animations as you can't always count on the PageTransformer
                 // callbacks to match up perfectly.
-                val tag = view?.tag as FragmentPageTag?
+                val tag = view.tag as FragmentPageTag?
                 tag ?: return
                 backgroundView.setBackgroundColor(tag.color)
 
@@ -124,7 +120,7 @@ internal class IntroductionActivity : AppCompatActivity() {
 
             } else {
 
-                val tag = view?.tag as FragmentPageTag?
+                val tag = view.tag as FragmentPageTag?
                 tag?: return
                 if (position < 0) {
                     start = tag.color
@@ -144,10 +140,10 @@ internal class IntroductionActivity : AppCompatActivity() {
                     val color = calColor(start!!, end!!, per!!)
                     backgroundView.setBackgroundColor(color)
                     calAlpha(iconBottleFrom!!, iconBottleTo!!,
-                             iconArrowFrom!!, iconArrowTo!!,
-                             iconAppFrom!!, iconAppTo!!,
-                             textFrom!!, textTo!!,
-                             per!!)
+                            iconArrowFrom!!, iconArrowTo!!,
+                            iconAppFrom!!, iconAppTo!!,
+                            textFrom!!, textTo!!,
+                            per!!)
                 }
 
                 //Log.d(TAG, "$view: $position, $iconBottleFrom")
diff --git a/components/src/main/kotlin/com/exyui/android/debugbottle/components/guide/__IntroductionFragment.kt b/components/src/main/kotlin/com/exyui/android/debugbottle/components/guide/__IntroductionFragment.kt
index 6196cbe..2c63b22 100644
--- a/components/src/main/kotlin/com/exyui/android/debugbottle/components/guide/__IntroductionFragment.kt
+++ b/components/src/main/kotlin/com/exyui/android/debugbottle/components/guide/__IntroductionFragment.kt
@@ -134,23 +134,23 @@ class __IntroductionFragment: Fragment() {
                 val block = v(R.id.__dt_enable_block_canary) as AppCompatCheckBox
                 val sniffer = v(R.id.__dt_enable_http_sniffer) as AppCompatCheckBox
 
-                bottle.setOnCheckedChangeListener { compoundButton, b ->
+                bottle.setOnCheckedChangeListener { _, b ->
                     DTSettings.bottleEnable = b
                 }
 
-                strict.setOnCheckedChangeListener { compoundButton, b ->
+                strict.setOnCheckedChangeListener { _, b ->
                     DTSettings.strictMode = b
                 }
 
-                leak.setOnCheckedChangeListener { compoundButton, b ->
+                leak.setOnCheckedChangeListener { _, b ->
                     DTSettings.leakCanaryEnable = b
                 }
 
-                block.setOnCheckedChangeListener { compoundButton, b ->
+                block.setOnCheckedChangeListener { _, b ->
                     DTSettings.blockCanaryEnable = b
                 }
 
-                sniffer.setOnCheckedChangeListener { compoundButton, b ->
+                sniffer.setOnCheckedChangeListener { _, b ->
                     DTSettings.networkSniff = b
                 }
             }
@@ -187,13 +187,13 @@ class __IntroductionFragment: Fragment() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        if (!arguments.containsKey(BACKGROUND_COLOR))
+        if (arguments?.containsKey(BACKGROUND_COLOR) == false)
             throw RuntimeException("Fragment must contain a \"$BACKGROUND_COLOR\" argument!")
-        backgroundColor = arguments.getInt(BACKGROUND_COLOR)
+        backgroundColor = arguments?.getInt(BACKGROUND_COLOR)
 
-        if (!arguments.containsKey(PAGE))
+        if (arguments?.containsKey(PAGE) == false)
             throw RuntimeException("Fragment must contain a \"$PAGE\" argument!")
-        page = arguments.getInt(PAGE)
+        page = arguments?.getInt(PAGE)
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
diff --git a/components/src/main/kotlin/com/exyui/android/debugbottle/components/injector/InjectableAdapter.kt b/components/src/main/kotlin/com/exyui/android/debugbottle/components/injector/InjectableAdapter.kt
index 5fa1002..ebfc2b7 100644
--- a/components/src/main/kotlin/com/exyui/android/debugbottle/components/injector/InjectableAdapter.kt
+++ b/components/src/main/kotlin/com/exyui/android/debugbottle/components/injector/InjectableAdapter.kt
@@ -44,7 +44,7 @@ internal class InjectableAdapter<out T>(private val injectable: Injectable<T>):
                 LayoutInflater.from(context).inflate(R.layout.__item_injector, parent, false)
         val h: Holder = if (null != v.tag) v.tag as Holder else {
             Holder().apply {
-                textView = v.findViewById(R.id.text_view) as TextView
+                textView = v.findViewById(R.id.text_view)
                 v.tag = this
             }
         }
diff --git a/components/src/main/kotlin/com/exyui/android/debugbottle/components/okhttp/DisplayHttpBlockActivity.kt b/components/src/main/kotlin/com/exyui/android/debugbottle/components/okhttp/DisplayHttpBlockActivity.kt
index 07ad012..18d1b65 100644
--- a/components/src/main/kotlin/com/exyui/android/debugbottle/components/okhttp/DisplayHttpBlockActivity.kt
+++ b/components/src/main/kotlin/com/exyui/android/debugbottle/components/okhttp/DisplayHttpBlockActivity.kt
@@ -11,7 +11,6 @@ import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
 import android.text.TextUtils
-import android.text.format.DateUtils
 import android.util.Log
 import android.view.*
 import android.widget.*
@@ -51,9 +50,9 @@ internal class DisplayHttpBlockActivity : Activity() {
     private val mBlockEntries: MutableList<HttpBlock> by lazy { ArrayList<HttpBlock>() }
     private var mBlockStartTime: String? = null
 
-    private val mListView by lazy { findViewById(R.id.__dt_canary_display_leak_list) as ListView }
-    private val mFailureView by lazy { findViewById(R.id.__dt_canary_display_leak_failure) as TextView }
-    private val mActionButton by lazy { findViewById(R.id.__dt_canary_action) as Button }
+    private val mListView by lazy { findViewById<ListView>(R.id.__dt_canary_display_leak_list)!! }
+    private val mFailureView by lazy { findViewById<TextView>(R.id.__dt_canary_display_leak_failure)!! }
+    private val mActionButton by lazy { findViewById<Button>(R.id.__dt_canary_action)!! }
     private val mMaxStoredBlockCount by lazy { resources.getInteger(R.integer.__block_canary_max_stored_count) }
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -182,7 +181,7 @@ internal class DisplayHttpBlockActivity : Activity() {
         } else {
             val adapter = BlockListAdapter()
             mListView.adapter = adapter
-            mListView.onItemClickListener = AdapterView.OnItemClickListener { parent, view, position, id ->
+            mListView.onItemClickListener = AdapterView.OnItemClickListener { _, _, position, _ ->
                 mBlockStartTime = mBlockEntries[position].timeStart.toString()
                 updateUi()
             }
@@ -210,7 +209,7 @@ internal class DisplayHttpBlockActivity : Activity() {
         } else {
             adapter = HttpBlockDetailAdapter()
             mListView.adapter = adapter
-            mListView.onItemClickListener = AdapterView.OnItemClickListener { parent, view, position, id ->
+            mListView.onItemClickListener = AdapterView.OnItemClickListener { _, _, position, _ ->
                 adapter.toggleRow(position)
             }
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
@@ -264,8 +263,8 @@ internal class DisplayHttpBlockActivity : Activity() {
             if (view == null) {
                 view = LayoutInflater.from(this@DisplayHttpBlockActivity).inflate(R.layout.__dt_canary_block_row, parent, false)
             }
-            val titleView = view!!.findViewById(R.id.__dt_canary_row_text) as TextView
-            val timeView = view.findViewById(R.id.__dt_canary_row_time) as TextView
+            val titleView = view!!.findViewById<TextView>(R.id.__dt_canary_row_text)
+            val timeView = view.findViewById<TextView>(R.id.__dt_canary_row_time)
             val block = getItem(position)
 
             val index: String
diff --git a/components/src/main/kotlin/com/exyui/android/debugbottle/components/okhttp/HttpBlockDetailAdapter.kt b/components/src/main/kotlin/com/exyui/android/debugbottle/components/okhttp/HttpBlockDetailAdapter.kt
index d8d5cdb..cc55026 100644
--- a/components/src/main/kotlin/com/exyui/android/debugbottle/components/okhttp/HttpBlockDetailAdapter.kt
+++ b/components/src/main/kotlin/com/exyui/android/debugbottle/components/okhttp/HttpBlockDetailAdapter.kt
@@ -27,22 +27,22 @@ internal class HttpBlockDetailAdapter: BaseAdapter() {
             if (view == null) {
                 view = LayoutInflater.from(context).inflate(R.layout.__dt_canary_ref_top_row, parent, false)
             }
-            val textView = view!!.findViewById(R.id.__dt_canary_row_text) as TextView
+            val textView = view!!.findViewById<TextView>(R.id.__dt_canary_row_text)
             textView.text = context.packageName
         } else {
             if (view == null) {
                 view = LayoutInflater.from(context).inflate(R.layout.__dt_canary_ref_row, parent, false)
             }
-            val textView = view!!.findViewById(R.id.__dt_canary_row_text) as TextView
+            val textView = view!!.findViewById<TextView>(R.id.__dt_canary_row_text)
 
             val element = getItem(position)
             val htmlString = elementToHtmlString(element, position, mFoldings[position - 1])
             textView.text = Html.fromHtml(htmlString)
 
-            val connectorView = view.findViewById(R.id.__dt_canary_row_connector) as __DisplayLeakConnectorView
+            val connectorView = view.findViewById<__DisplayLeakConnectorView>(R.id.__dt_canary_row_connector)
             connectorView.setType(connectorViewType(position))
 
-            val moreDetailsView = view.findViewById(R.id.__dt_canary_row_more) as __MoreDetailsView
+            val moreDetailsView = view.findViewById<__MoreDetailsView>(R.id.__dt_canary_row_more)
             moreDetailsView.setFolding(mFoldings[position - 1])
         }
 
diff --git a/components/src/main/kotlin/com/exyui/android/debugbottle/components/widgets/DTListItemSwitch.kt b/components/src/main/kotlin/com/exyui/android/debugbottle/components/widgets/DTListItemSwitch.kt
index 2c20cac..bcb0a66 100644
--- a/components/src/main/kotlin/com/exyui/android/debugbottle/components/widgets/DTListItemSwitch.kt
+++ b/components/src/main/kotlin/com/exyui/android/debugbottle/components/widgets/DTListItemSwitch.kt
@@ -88,9 +88,9 @@ internal class DTListItemSwitch : LinearLayout {
 
     private fun bindViews() {
         inflate(context, R.layout.__custom_list_item_swicher, this)
-        titleView = findViewById(R.id.__dt_title) as TextView
-        contentView = findViewById(R.id.__dt_content) as TextView
-        switchView = findViewById(R.id.__dt_switcher) as SwitchCompat
+        titleView = findViewById(R.id.__dt_title)
+        contentView = findViewById(R.id.__dt_content)
+        switchView = findViewById(R.id.__dt_switcher)
     }
 
     private fun init(context: Context, attr: AttributeSet? = null, defStyleAttr: Int? = null, defStyleRes: Int? = null) {
diff --git a/components/src/main/kotlin/com/exyui/android/debugbottle/components/widgets/__FloatingDialogHeaderLayout.kt b/components/src/main/kotlin/com/exyui/android/debugbottle/components/widgets/__FloatingDialogHeaderLayout.kt
index e729f99..564202f 100644
--- a/components/src/main/kotlin/com/exyui/android/debugbottle/components/widgets/__FloatingDialogHeaderLayout.kt
+++ b/components/src/main/kotlin/com/exyui/android/debugbottle/components/widgets/__FloatingDialogHeaderLayout.kt
@@ -47,8 +47,8 @@ internal class __FloatingDialogHeaderLayout : LinearLayout {
 
     private fun bindViews() {
         inflate(context, R.layout.__custom_floating_header, this)
-        titleView = findViewById(R.id.__dt_header_title) as TextView
-        actionView = findViewById(R.id.__dt_header_action) as ImageView
+        titleView = findViewById(R.id.__dt_header_title)
+        actionView = findViewById(R.id.__dt_header_action)
         closeView = findViewById(R.id.__dt_header_close)
     }
 
diff --git a/core/src/main/kotlin/com/exyui/android/debugbottle/core/log/__BlockCanaryInternals.kt b/core/src/main/kotlin/com/exyui/android/debugbottle/core/log/__BlockCanaryInternals.kt
index 25fca96..2ec5833 100644
--- a/core/src/main/kotlin/com/exyui/android/debugbottle/core/log/__BlockCanaryInternals.kt
+++ b/core/src/main/kotlin/com/exyui/android/debugbottle/core/log/__BlockCanaryInternals.kt
@@ -34,7 +34,7 @@ object __BlockCanaryInternals {
         get() {
             val f = detectedBlockDirectory()
             if (f.exists() && f.isDirectory) {
-                return f.listFiles { dir, filename ->
+                return f.listFiles { _, filename ->
                     filename.endsWith(TYPE)
                 }
             }
diff --git a/demo/src/main/kotlin/me/chunyu/dev/yuriel/kotdebugtool/DemoActivity.kt b/demo/src/main/kotlin/me/chunyu/dev/yuriel/kotdebugtool/DemoActivity.kt
index 9f5af8b..c58b239 100644
--- a/demo/src/main/kotlin/me/chunyu/dev/yuriel/kotdebugtool/DemoActivity.kt
+++ b/demo/src/main/kotlin/me/chunyu/dev/yuriel/kotdebugtool/DemoActivity.kt
@@ -1,15 +1,10 @@
 package me.chunyu.dev.yuriel.kotdebugtool
 
-import android.app.PendingIntent
-import android.content.Intent
 import android.os.Bundle
-import android.os.PersistableBundle
 import android.support.v7.app.AppCompatActivity
 import android.view.View
 import android.view.ViewGroup
-import android.view.Window
 import android.view.animation.AnimationUtils
-import com.exyui.android.debugbottle.components.injector.IntentInjector
 
 /**
  * Created by yuriel on 8/9/16.
diff --git a/demo/src/main/kotlin/me/chunyu/dev/yuriel/kotdebugtool/DemoFragment.kt b/demo/src/main/kotlin/me/chunyu/dev/yuriel/kotdebugtool/DemoFragment.kt
index 50fd561..9a2bf27 100644
--- a/demo/src/main/kotlin/me/chunyu/dev/yuriel/kotdebugtool/DemoFragment.kt
+++ b/demo/src/main/kotlin/me/chunyu/dev/yuriel/kotdebugtool/DemoFragment.kt
@@ -10,7 +10,6 @@ import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Button
 import com.squareup.okhttp.Request
 import java.io.FileInputStream
 import java.io.IOException
@@ -19,27 +18,13 @@ import java.io.IOException
  * Created by yuriel on 8/9/16.
  */
 class DemoFragment : Fragment(), View.OnClickListener {
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-    }
-
-    override fun onCreateView(inflater: LayoutInflater?, container: ViewGroup?, savedInstanceState: Bundle?): View? =
-            inflater?.inflate(R.layout.fragment_main, null)
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? = inflater.inflate(R.layout.fragment_main, null)
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         listOf(R.id.button1, R.id.button2, R.id.button3, R.id.button4, R.id.button5, R.id.__read_me,
                 R.id.crash_button, R.id.crash_button, R.id.introduction, R.id.launch_dt)
-                .forEach { view.findViewById(it).setOnClickListener(this) }
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-    }
-
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
+                .forEach { view.findViewById<View>(it).setOnClickListener(this) }
     }
 
     override fun onClick(v: View) {
@@ -60,7 +45,7 @@ class DemoFragment : Fragment(), View.OnClickListener {
             }
             R.id.button4 -> {
                 startAsyncTask()
-                activity.finish()
+                activity?.finish()
             }
             R.id.button5 -> {
                 sendRequest()
diff --git a/gradle.properties b/gradle.properties
index f5352a9..3b498b8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -21,11 +21,11 @@ org.gradle.jvmargs=-Xmx2048M
 SNAPSHOT=false
 
 # May cause merge file conflicts
-VERSION_NAME=1.1.1
+VERSION_NAME=1.1.2
 VERSION_CODE=1
 MIN_SDK=14
-COMPILE_SDK=23
-TARGET_SDK=23
+COMPILE_SDK=26
+TARGET_SDK=26
 BUILD_TOOLS=23.0.3
 
 GROUP=com.exyui.android