mod

Author: iceCola7

app/src/main/java/com/cxz/wanandroid/ui/activity/KnowledgeActivity.kt

@@ -1,16 +1,19 @@
 package com.cxz.wanandroid.ui.activity
 
 import android.content.Intent
+import android.content.res.ColorStateList
 import android.support.design.widget.TabLayout
 import android.view.Menu
 import android.view.MenuItem
+import android.view.View
 import com.cxz.wanandroid.R
 import com.cxz.wanandroid.adapter.KnowledgePagerAdapter
 import com.cxz.wanandroid.base.BaseSwipeBackActivity
 import com.cxz.wanandroid.constant.Constant
 import com.cxz.wanandroid.event.ColorEvent
 import com.cxz.wanandroid.mvp.model.bean.Knowledge
 import com.cxz.wanandroid.mvp.model.bean.KnowledgeTreeBody
+import com.cxz.wanandroid.ui.fragment.KnowledgeFragment
 import com.cxz.wanandroid.utils.SettingUtil
 import kotlinx.android.synthetic.main.activity_knowledge.*
 import org.greenrobot.eventbus.Subscribe
@@ -38,9 +41,9 @@ class KnowledgeActivity : BaseSwipeBackActivity() {
     override fun attachLayoutRes(): Int = R.layout.activity_knowledge
 
     override fun initData() {
-        intent.extras.let {
-            toolbarTitle = it.getString(Constant.CONTENT_TITLE_KEY)
-            it.getSerializable(Constant.CONTENT_DATA_KEY).let {
+        intent.extras?.let {
+            toolbarTitle = it.getString(Constant.CONTENT_TITLE_KEY) ?: ""
+            it.getSerializable(Constant.CONTENT_DATA_KEY)?.let {
                 val data = it as KnowledgeTreeBody
                 data.children.let { children ->
                     knowledges.addAll(children)
@@ -69,6 +72,9 @@ class KnowledgeActivity : BaseSwipeBackActivity() {
             addOnTabSelectedListener(TabLayout.ViewPagerOnTabSelectedListener(viewPager))
             addOnTabSelectedListener(onTabSelectedListener)
         }
+        floating_action_btn.run {
+            setOnClickListener(onFABClickListener)
+        }
 
     }
 
@@ -85,6 +91,7 @@ class KnowledgeActivity : BaseSwipeBackActivity() {
         if (event.isRefresh) {
             if (!SettingUtil.getIsNightMode()) {
                 tabLayout.setBackgroundColor(SettingUtil.getColor())
+                floating_action_btn.backgroundTintList = ColorStateList.valueOf(mThemeColor)
             }
         }
     }
@@ -101,8 +108,21 @@ class KnowledgeActivity : BaseSwipeBackActivity() {
 
         override fun onTabSelected(tab: TabLayout.Tab?) {
             // 默认切换的时候，会有一个过渡动画，设为false后，取消动画，直接显示
-            viewPager.setCurrentItem(tab?.position!!, false)
+            tab?.let {
+                viewPager.setCurrentItem(it.position, false)
+            }
+        }
+    }
+
+    /**
+     * FAB 监听
+     */
+    private val onFABClickListener = View.OnClickListener {
+        if (viewPagerAdapter.count == 0) {
+            return@OnClickListener
         }
+        val fragment: KnowledgeFragment = viewPagerAdapter.getItem(viewPager.currentItem) as KnowledgeFragment
+        fragment.scrollToTop()
     }
 
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {

app/src/main/java/com/cxz/wanandroid/ui/activity/MainActivity.kt

@@ -127,15 +127,15 @@ class MainActivity : BaseActivity(), MainContract.View {
             } else {
                 username
             }
-            setOnClickListener({
+            setOnClickListener {
                 if (!isLogin) {
                     Intent(this@MainActivity, LoginActivity::class.java).run {
                         startActivity(this)
                     }
                 } else {
 
                 }
-            })
+            }
         }
 
         showFragment(mIndex)

app/src/main/java/com/cxz/wanandroid/ui/activity/TodoActivity.kt

@@ -94,7 +94,9 @@ class TodoActivity : BaseSwipeBackActivity() {
 
         override fun onTabSelected(tab: TabLayout.Tab?) {
             // 默认切换的时候，会有一个过渡动画，设为false后，取消动画，直接显示
-            viewPager.setCurrentItem(tab?.position!!, false)
+            tab?.let {
+                viewPager.setCurrentItem(it.position, false)
+            }
         }
     }
 

app/src/main/java/com/cxz/wanandroid/ui/fragment/ProjectFragment.kt

@@ -110,7 +110,9 @@ class ProjectFragment : BaseFragment(), ProjectContract.View {
 
         override fun onTabSelected(tab: TabLayout.Tab?) {
             // 默认切换的时候，会有一个过渡动画，设为false后，取消动画，直接显示
-            viewPager.setCurrentItem(tab?.position!!, false)
+            tab?.let {
+                viewPager.setCurrentItem(it.position, false)
+            }
         }
     }
 

app/src/main/res/layout/activity_knowledge.xml

@@ -34,6 +34,16 @@
 
     </android.support.design.widget.AppBarLayout>
 
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/floating_action_btn"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|right"
+        android:layout_marginBottom="@dimen/dp_20"
+        android:layout_marginRight="@dimen/dp_20"
+        app:layout_behavior="com.cxz.wanandroid.widget.behavior.ScaleDownShowBehavior"
+        app:srcCompat="@drawable/ic_arrow_upward_white_24dp" />
+
     <android.support.v4.view.ViewPager
         android:id="@+id/viewPager"
         android:layout_width="match_parent"