BlocksActivity: 使用定制跳转动画

ztc1997 · ztc1997 · commit 487dcc05e913 · 2016-02-15T15:30:34.000+08:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -18,6 +18,7 @@ android {
         targetSdkVersion Integer.parseInt("$targetSdkVer")
         versionCode Integer.parseInt("$verCode")
         versionName "$verName"
+        multiDexEnabled true
     }
 
     buildTypes {
@@ -117,6 +118,8 @@ dependencies {
     compile 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
 
     compile 'com.github.jd-alexander:LikeButton:0.1.8'
+
+    compile 'com.balysv.materialmenu:material-menu-toolbar:1.5.4'
 }
 
 bugly {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -66,7 +66,7 @@
         <activity
                 android:name=".ui.activity.BlocksActivity"
                 android:label="@string/title_activity_blocks"
-                android:theme="@style/AppTheme"/>
+                android:theme="@style/AppTheme.NoActionBar.Transparent"/>
         <activity
                 android:name=".ui.activity.UserActivity"
                 android:label="@string/title_activity_user"
diff --git a/app/src/main/kotlin/com/rayfantasy/icode/ui/activity/BlocksActivity.kt b/app/src/main/kotlin/com/rayfantasy/icode/ui/activity/BlocksActivity.kt
@@ -1,7 +1,14 @@
 package com.rayfantasy.icode.ui.activity
 
+import android.animation.Animator
+import android.animation.AnimatorListenerAdapter
+import android.app.Activity
 import android.databinding.DataBindingUtil
+import android.graphics.Color
 import android.os.Bundle
+import android.view.View
+import android.view.animation.DecelerateInterpolator
+import com.balysv.materialmenu.MaterialMenuDrawable
 import com.h6ah4i.android.widget.advrecyclerview.animator.RefactoredDefaultItemAnimator
 import com.rayfantasy.icode.R
 import com.rayfantasy.icode.databinding.ActivityBlocksBinding
@@ -18,8 +25,19 @@ import org.jetbrains.anko.startActivity
 import org.jetbrains.anko.toast
 
 class BlocksActivity : ActivityBindingStatus() {
+    companion object {
+        private const val TRANSFORM_DURATION = 300
+    }
+
     private lateinit var codeGood: CodeGood
     private lateinit var binding: ActivityBlocksBinding
+    private val menuDrawable by lazy {
+        MaterialMenuDrawable(this, Color.WHITE, MaterialMenuDrawable.Stroke.THIN,
+                (TRANSFORM_DURATION * 1.5).toInt())
+    }
+    private var transformFinished = false
+    private var scaleY = 0f
+    private var translationY = 0f
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -34,25 +52,90 @@ class BlocksActivity : ActivityBindingStatus() {
         }
 
         codeGood.loadContentFromCache()
-        codeGood.content?.let { recyclerView.adapter = BlockAdapter(this, codeGood, PostUtil.gson.fromJson(codeGood.content)) }
 
         PostUtil.loadCodeContent(codeGood.id!!,
                 {
                     with(codeGood) {
                         content = it
                         save()
                     }
-                    if (recyclerView.adapter == null)
-                        recyclerView.adapter = BlockAdapter(this, codeGood, PostUtil.gson.fromJson(codeGood.content))
-                    else {
-                        (recyclerView.adapter as BlockAdapter).blocks = PostUtil.gson.fromJson(codeGood.content)
-                        recyclerView.adapter.notifyDataSetChanged()
+                    if (transformFinished) {
+                        if (recyclerView.adapter == null)
+                            recyclerView.adapter = BlockAdapter(this, codeGood, PostUtil.gson.fromJson(codeGood.content))
+                        else {
+                            (recyclerView.adapter as BlockAdapter).blocks = PostUtil.gson.fromJson(codeGood.content)
+                            recyclerView.adapter.notifyDataSetChanged()
+                        }
                     }
                 }, { t, rc ->
             toast("rc = $rc")
             t.printStackTrace()
         })
         block_fab.onClick { startActivity<ReplyActivity>("id" to codeGood.id) }
+
+        toolbar.navigationIcon = menuDrawable
+        if (intent.hasExtra("y") && intent.hasExtra("height")) {
+            if (intent.getBooleanExtra("arrowAnim", true)) {
+                menuDrawable.iconState = MaterialMenuDrawable.IconState.BURGER
+                menuDrawable.animateIconState(MaterialMenuDrawable.IconState.ARROW)
+            } else {
+                menuDrawable.iconState = MaterialMenuDrawable.IconState.ARROW
+            }
+            recyclerView.alpha = 0f
+            recyclerView.post {
+                scaleY = (intent.getFloatExtra("height", 0f) / recyclerView.height).toFloat()
+                translationY = intent.getFloatExtra("y", 0f) - (recyclerView.height / 2)
+                recyclerView.scaleY = scaleY
+                recyclerView.translationY = translationY
+                recyclerView.alpha = 1f
+                recyclerView.animate()
+                        .setInterpolator(DecelerateInterpolator())
+                        .translationY(0f)
+                        .scaleY(1f)
+                        .setDuration(TRANSFORM_DURATION.toLong())
+                        .start()
+            }
+        } else {
+            menuDrawable.iconState = MaterialMenuDrawable.IconState.ARROW
+        }
+
+        recyclerView.postDelayed({
+            codeGood.content?.let { recyclerView.adapter = BlockAdapter(this, codeGood, PostUtil.gson.fromJson(codeGood.content)) }
+        }, TRANSFORM_DURATION.toLong())
     }
 
+    override fun onBackPressed() {
+        if (intent.hasExtra("y") && intent.hasExtra("height")) {
+            if (intent.getBooleanExtra("arrowAnim", true)) {
+                menuDrawable.animateIconState(MaterialMenuDrawable.IconState.BURGER)
+            }
+            recyclerView.adapter = null
+            recyclerView.animate()
+                    .setInterpolator(DecelerateInterpolator())
+                    .translationY(translationY)
+                    .scaleY(scaleY)
+                    .setDuration(TRANSFORM_DURATION.toLong())
+                    .setListener(object : AnimatorListenerAdapter() {
+                        override fun onAnimationEnd(animation: Animator?) {
+                            super@BlocksActivity.onBackPressed()
+                            overridePendingTransition(0, 0)
+                        }
+                    })
+                    .start()
+        } else {
+            super.onBackPressed()
+        }
+    }
+}
+
+fun View.startBlockActivity(codeGood: CodeGood, arrowAnim: Boolean = true) {
+    val location = intArrayOf(0, 0)
+    getLocationOnScreen(location)
+    val y = location[1]
+    context.startActivity<BlocksActivity>("codeGood" to codeGood,
+            "y" to y.toFloat(),
+            "height" to height.toFloat(),
+            "arrowAnim" to arrowAnim)
+    if (context is Activity)
+        (context as Activity).overridePendingTransition(0, 0)
 }
diff --git a/app/src/main/kotlin/com/rayfantasy/icode/ui/adapter/CodeListAdapter.kt b/app/src/main/kotlin/com/rayfantasy/icode/ui/adapter/CodeListAdapter.kt
@@ -26,8 +26,8 @@ import com.rayfantasy.icode.extension.inflate
 import com.rayfantasy.icode.extension.loadPortrait
 import com.rayfantasy.icode.model.ICodeTheme
 import com.rayfantasy.icode.postutil.bean.CodeGood
-import com.rayfantasy.icode.ui.activity.BlocksActivity
 import com.rayfantasy.icode.ui.activity.UserActivity
+import com.rayfantasy.icode.ui.activity.startBlockActivity
 import com.rayfantasy.icode.util.ms2RelativeDate
 import kotlinx.android.synthetic.main.item_recycler_code_list.view.*
 import org.jetbrains.anko.onClick
@@ -58,7 +58,15 @@ class CodeListAdapter(val activity: Activity, var codeGoods: MutableList<CodeGoo
         }*/
 
         holder.bg.onClick {
-            activity.startActivity<BlocksActivity>("codeGood" to codeGood)
+            holder.bg.startBlockActivity(codeGood)
+            /*val location = intArrayOf(0,0)
+            holder.bg.getLocationOnScreen(location)
+            val y = location[1]
+            val height = holder.bg.height
+            activity.startActivity<BlocksActivity>("codeGood" to codeGood,
+                    "y" to y.toFloat(),
+                    "height" to height.toFloat())
+            activity.overridePendingTransition(0, 0)*/
         }
     }
 
diff --git a/app/src/main/kotlin/com/rayfantasy/icode/ui/adapter/UserListAdapter.kt b/app/src/main/kotlin/com/rayfantasy/icode/ui/adapter/UserListAdapter.kt
@@ -16,15 +16,14 @@ import com.rayfantasy.icode.extension.loadPortrait
 import com.rayfantasy.icode.extension.shadowColor
 import com.rayfantasy.icode.postutil.PostUtil
 import com.rayfantasy.icode.postutil.bean.CodeGood
-import com.rayfantasy.icode.ui.activity.BlocksActivity
+import com.rayfantasy.icode.ui.activity.startBlockActivity
 import com.rayfantasy.icode.util.ms2RelativeDate
 import jp.wasabeef.glide.transformations.CropCircleTransformation
 import kotlinx.android.synthetic.main.footer_recycler_view.view.*
 import kotlinx.android.synthetic.main.item_recycler_code_list.view.*
 import kotlinx.android.synthetic.main.item_recycler_user.view.*
 import org.jetbrains.anko.image
 import org.jetbrains.anko.onClick
-import org.jetbrains.anko.startActivity
 
 /**
  * Created by qweas on 2016/1/22 0022.
@@ -93,9 +92,7 @@ class UserListAdapter(val activity: Activity, var username: String, var codeGood
                     holder.subTitle.setTextColor(Color.rgb(140, 140, 140))
                 }
                 holder.pic.loadPortrait(username)
-                holder.bg.onClick {
-                    activity.startActivity<BlocksActivity>("codeGood" to codeGood)
-                }
+                holder.bg.onClick { holder.bg.startBlockActivity(codeGood, false) }
             }
             is FooterViewHolder -> {
                 setFooterState(FOOTER_STATE_LOADING)
diff --git a/app/src/main/res/layout/content_blocks.xml b/app/src/main/res/layout/content_blocks.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
-                                        xmlns:app="http://schemas.android.com/apk/res-auto"
-                                        xmlns:tools="http://schemas.android.com/tools"
-                                        android:id="@+id/recyclerView"
-                                        android:layout_width="match_parent"
-                                        android:layout_height="match_parent"
-                                        app:layout_behavior="@string/appbar_scrolling_view_behavior"
-                                        tools:context=".ui.activity.BlocksActivity"
-                                        tools:showIn="@layout/activity_blocks"/>
+<android.support.v7.widget.RecyclerView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:id="@+id/recyclerView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"
+        tools:context=".ui.activity.BlocksActivity"
+        tools:showIn="@layout/activity_blocks"
+        android:background="?android:colorBackground"/>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -16,6 +16,11 @@
         <item name="windowNoTitle">true</item>
     </style>
 
+    <style name="AppTheme.NoActionBar.Transparent">
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowIsTranslucent">true</item>
+    </style>
+
     <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar"/>
 
     <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light"/>

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ android {`
`18`	`18`	`targetSdkVersion Integer.parseInt("$targetSdkVer")`
`19`	`19`	`versionCode Integer.parseInt("$verCode")`
`20`	`20`	`versionName "$verName"`
	`21`	`+ multiDexEnabled true`
`21`	`22`	`}`
`22`	`23`
`23`	`24`	`buildTypes {`
`@@ -117,6 +118,8 @@ dependencies {`
`117`	`118`	`compile 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'`
`118`	`119`
`119`	`120`	`compile 'com.github.jd-alexander:LikeButton:0.1.8'`
	`121`	`+`
	`122`	`+ compile 'com.balysv.materialmenu:material-menu-toolbar:1.5.4'`
`120`	`123`	`}`
`121`	`124`
`122`	`125`	`bugly {`