Skip to content

Commit

Permalink
remove anim and add max count .
Browse files Browse the repository at this point in the history
  • Loading branch information
@lovejjfg
lovejjfg committed May 2, 2018
1 parent 9113e07 commit c186e89
Show file tree
Hide file tree
Showing 13 changed files with 204 additions and 143 deletions.
9 changes: 0 additions & 9 deletions app/src/main/java/com/lovejjfg/readhub/base/BaseActivity.kt
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
package com.lovejjfg.readhub.base

import android.content.Context
import android.os.Build
import android.os.Bundle
import android.support.v7.app.AppCompatActivity
import android.transition.Slide
import android.view.Gravity
import android.view.Window
import com.lovejjfg.readhub.R
import com.lovejjfg.readhub.utils.ErrorUtil
import com.lovejjfg.readhub.utils.RxBus
Expand All @@ -24,11 +20,6 @@ import io.reactivex.functions.Consumer
abstract class BaseActivity : AppCompatActivity(), IBaseView {
private var mDisposables: CompositeDisposable? = null
override fun onCreate(savedInstanceState: Bundle?) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
window.requestFeature(Window.FEATURE_CONTENT_TRANSITIONS)
window.enterTransition = Slide(Gravity.RIGHT)
window.exitTransition = Slide(Gravity.LEFT)
}
beforeCreate(savedInstanceState)
super.onCreate(savedInstanceState)
afterCreatedView(savedInstanceState)
Expand Down
6 changes: 1 addition & 5 deletions app/src/main/java/com/lovejjfg/readhub/base/BaseFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import io.reactivex.disposables.Disposable
abstract class BaseFragment : Fragment(), IBaseView {
var mDisposables: CompositeDisposable? = null
var mContext: Context? = null
val TAG = "name"

override fun onAttach(context: Context?) {
super.onAttach(context)
Expand All @@ -49,7 +50,6 @@ abstract class BaseFragment : Fragment(), IBaseView {
afterCreatedView(savedInstanceState)
}


fun initFragments(savedInstanceState: Bundle?, fragment: BaseFragment) {
if (savedInstanceState == null) {
return
Expand All @@ -67,7 +67,6 @@ abstract class BaseFragment : Fragment(), IBaseView {
override fun onSaveInstanceState(outState: Bundle?) {
outState!!.putBoolean(ARG_IS_HIDDEN, isHidden)
super.onSaveInstanceState(outState)

}

override fun showToast(toast: String) {
Expand All @@ -84,11 +83,9 @@ abstract class BaseFragment : Fragment(), IBaseView {
override fun showLoadingDialog(cancelable: Boolean) {
}


override fun closeLoadingDialog() {
}


override fun subscribe(subscriber: Disposable) {
mDisposables?.add(subscriber)
}
Expand All @@ -114,5 +111,4 @@ abstract class BaseFragment : Fragment(), IBaseView {
companion object {
val ARG_IS_HIDDEN = "ARG_IS_HIDDEN"
}

}
104 changes: 54 additions & 50 deletions app/src/main/java/com/lovejjfg/readhub/base/RefreshFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,17 +54,15 @@ import com.lovejjfg.readhub.utils.event.ScrollEvent
import com.lovejjfg.readhub.view.HomeActivity
import com.tencent.bugly.crashreport.CrashReport
import io.reactivex.functions.Consumer
import kotlinx.android.synthetic.main.layout_refresh_recycler.*
import kotlinx.android.synthetic.main.layout_refresh_recycler.rv_hot
import java.io.File


/**
* ReadHub
* Created by Joe at 2017/7/30.
*/
abstract class RefreshFragment : BaseFragment() {
@Suppress("PropertyName")
protected val TAG = "HotTopicFragment"
protected var order: String? = null
protected var latestOrder: String? = null
protected var preOrder: String? = null
Expand All @@ -81,13 +79,12 @@ abstract class RefreshFragment : BaseFragment() {
super.onCreate(savedInstanceState)
hintArrays = resources.getStringArray(R.array.share_hints)
RxBus.instance.addSubscription(this, ScrollEvent::class.java,
Consumer {
if (isVisible) {
binding?.rvHot?.scrollToPosition(0)
}
},
Consumer { Log.e(TAG, "error:", it) })

Consumer {
if (isVisible) {
binding?.rvHot?.scrollToPosition(0)
}
},
Consumer { Log.e(TAG, "error:", it) })
}

override fun onCreateView(inflater: LayoutInflater?, container: ViewGroup?, savedInstanceState: Bundle?): View {
Expand Down Expand Up @@ -149,7 +146,8 @@ abstract class RefreshFragment : BaseFragment() {
return
}
if (recyclerView?.layoutManager is LinearLayoutManager) {
val first = (recyclerView.layoutManager as LinearLayoutManager).findFirstCompletelyVisibleItemPosition()
val first =
(recyclerView.layoutManager as LinearLayoutManager).findFirstCompletelyVisibleItemPosition()
if (first == 0) {
showNav()
return
Expand Down Expand Up @@ -196,8 +194,8 @@ abstract class RefreshFragment : BaseFragment() {
adapter?.setOnItemLongClickListener { _, position, _ ->
val quick = try {
PreferenceManager
.getDefaultSharedPreferences(mContext)
.getBoolean(getString(R.string.quick_share), false)
.getDefaultSharedPreferences(mContext)
.getBoolean(getString(R.string.quick_share), false)
} catch (e: Exception) {
false
}
Expand All @@ -213,10 +211,10 @@ abstract class RefreshFragment : BaseFragment() {
private fun showShareDialog(position: Int) {
if (mShareDialog == null) {
mShareDialog = AlertDialog.Builder(mContext!!)
.setTitle(getString(R.string.share))
.setMessage(getString(R.string.share_hint_default))
.setNegativeButton(getString(R.string.not_send), { _, _ ->
}).create()
.setTitle(getString(R.string.share))
.setMessage(getString(R.string.share_hint_default))
.setNegativeButton(getString(R.string.not_send), { _, _ ->
}).create()
}
if (hintArrays != null) {
val d = Math.random() * 100
Expand All @@ -241,7 +239,10 @@ abstract class RefreshFragment : BaseFragment() {
itemView?.findViewById<View>(R.id.iv_share)?.visibility = View.INVISIBLE
val bitmap = itemView?.toBitmap(Bitmap.Config.ARGB_8888)
itemView?.findViewById<View>(R.id.iv_share)?.visibility = View.VISIBLE
val file = File(mContext?.externalCacheDir, String.format(getString(R.string.img_name), System.currentTimeMillis().toString()))
val file = File(
mContext?.externalCacheDir,
String.format(getString(R.string.img_name), System.currentTimeMillis().toString())
)
AtomicFile(file).tryWrite {
bitmap?.compress(Bitmap.CompressFormat.JPEG, 100, it)
bitmap?.recycle()
Expand All @@ -252,7 +253,11 @@ abstract class RefreshFragment : BaseFragment() {
shareIntent.putExtra(Intent.EXTRA_STREAM, uriToImage)
shareIntent.type = Constants.IMAGE_TYPE
startActivity(Intent.createChooser(shareIntent, getString(R.string.share_news)))
FirebaseUtils.logEvent(mContext!!, getString(R.string.share), Pair(Constants.NEWS_ID, adapter?.list!![position]?.id))
FirebaseUtils.logEvent(
mContext!!,
getString(R.string.share),
Pair(Constants.NEWS_ID, adapter?.list!![position]?.id)
)
} catch (e: Exception) {
e.printStackTrace()
CrashReport.postCatchedException(e)
Expand All @@ -262,19 +267,19 @@ abstract class RefreshFragment : BaseFragment() {

protected fun showNav() {
navigation?.animate()
?.translationY(0f)
?.setListener(object : AnimatorListenerAdapter() {
override fun onAnimationStart(animation: Animator?) {
mIsAnimating = true
}
?.translationY(0f)
?.setListener(object : AnimatorListenerAdapter() {
override fun onAnimationStart(animation: Animator?) {
mIsAnimating = true
}

override fun onAnimationEnd(animation: Animator?) {
super.onAnimationEnd(animation)
mIsAnimating = false
mIsVisible = true
}
})
?.start()
override fun onAnimationEnd(animation: Animator?) {
super.onAnimationEnd(animation)
mIsAnimating = false
mIsVisible = true
}
})
?.start()
}

protected fun hideNav() {
Expand All @@ -283,27 +288,26 @@ abstract class RefreshFragment : BaseFragment() {

protected fun hideNav(listenerAdapter: AnimatorListenerAdapter?) {
navigation?.animate()
?.translationY(navigation?.height!! + 0.5f)
?.setListener(object : AnimatorListenerAdapter() {
override fun onAnimationStart(animation: Animator?) {
mIsAnimating = true
listenerAdapter?.onAnimationStart(animation)
}
?.translationY(navigation?.height!! + 0.5f)
?.setListener(object : AnimatorListenerAdapter() {
override fun onAnimationStart(animation: Animator?) {
mIsAnimating = true
listenerAdapter?.onAnimationStart(animation)
}

override fun onAnimationEnd(animation: Animator?) {
mIsAnimating = false
mIsVisible = false
listenerAdapter?.onAnimationEnd(animation)
}
})
?.start()
override fun onAnimationEnd(animation: Animator?) {
mIsAnimating = false
mIsVisible = false
listenerAdapter?.onAnimationEnd(animation)
}
})
?.start()
}

abstract fun createAdapter(): PowerAdapter<DataItem>?

abstract fun refresh(refresh: SwipeRefreshLayout?)


abstract fun loadMore()

override fun onResume() {
Expand All @@ -312,7 +316,6 @@ abstract class RefreshFragment : BaseFragment() {
if (!isHidden) {
adapter?.notifyDataSetChanged()
}

}

override fun onDestroy() {
Expand All @@ -321,7 +324,6 @@ abstract class RefreshFragment : BaseFragment() {
mSnackBar = null
}


override fun onHiddenChanged(hidden: Boolean) {
super.onHiddenChanged(hidden)
if (!hidden) {
Expand Down Expand Up @@ -350,7 +352,11 @@ abstract class RefreshFragment : BaseFragment() {
}
}

protected inline fun handleAlreadRead(loadMore: Boolean, data: List<DataItem?>, check: (item: DataItem?) -> Boolean) {
protected inline fun handleAlreadRead(
loadMore: Boolean,
data: List<DataItem?>,
check: (item: DataItem?) -> Boolean
) {
println("currentId:$latestOrder;;preId::$preOrder")
try {
if (TextUtils.equals(latestOrder, preOrder)) {
Expand Down Expand Up @@ -404,6 +410,4 @@ abstract class RefreshFragment : BaseFragment() {
@Volatile
var mSnackBar: Snackbar? = null
}


}
4 changes: 3 additions & 1 deletion app/src/main/java/com/lovejjfg/readhub/data/Constants.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ object Constants {
const val DEV: String = "developer"
const val BLOCK_CHAIN: String = "block_chain"
const val ID: String = "id"
// const val EXTRA: String = "extra"
// const val EXTRA: String = "extra"
const val TAB_ID: String = "tab_id"
const val SHOW_PROMISSION: String = "SHOW_PROMISSION"
const val DATA: String = "data"
Expand All @@ -49,4 +49,6 @@ object Constants {
const val TYPE_PARSE_TEXT = 6

const val TYPE_ALREADY_READ = 0xff0001

const val ITEM_MAX_COUNT = 3
}
1 change: 0 additions & 1 deletion app/src/main/java/com/lovejjfg/readhub/data/DataManager.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ import java.util.concurrent.TimeUnit
*/
object DataManager {


private var retrofit: Retrofit? = null
private val isDebug = false
private const val TIME_OUT = 10L
Expand Down
2 changes: 0 additions & 2 deletions app/src/main/java/com/lovejjfg/readhub/data/ReadHubService.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,4 @@ interface ReadHubService {

@GET("blockchain")
fun blockchainMore(@Query("lastCursor") lastId: String, @Query("pageSize") size: Int): Observable<Response<Develop>>


}
23 changes: 8 additions & 15 deletions app/src/main/java/com/lovejjfg/readhub/utils/JumpUitl.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,21 @@

package com.lovejjfg.readhub.utils

import android.app.Activity
import android.content.Context
import android.content.Intent
import android.net.Uri
import android.os.Bundle
import android.preference.PreferenceManager
import android.support.v4.app.ActivityCompat
import android.support.v4.app.ActivityOptionsCompat
import android.text.TextUtils
import com.google.firebase.analytics.FirebaseAnalytics
import com.lovejjfg.readhub.data.Constants
import com.lovejjfg.readhub.view.*
import com.lovejjfg.readhub.view.AboutActivity
import com.lovejjfg.readhub.view.InstantActivity
import com.lovejjfg.readhub.view.SettingsActivity
import com.lovejjfg.readhub.view.TopicDetailActivity
import com.lovejjfg.readhub.view.WebActivity
import com.tencent.bugly.crashreport.CrashReport


/**
* ReadHub
* Created by Joe at 2017/8/5.
Expand All @@ -49,8 +49,8 @@ object JumpUitl {
bundle.putString("链接", url)
FirebaseAnalytics.getInstance(context).logEvent("点击", bundle)
val default = PreferenceManager
.getDefaultSharedPreferences(context)
.getBoolean("browser_use", false)
.getDefaultSharedPreferences(context)
.getBoolean("browser_use", false)

if (!default) {
val intent = Intent(context, WebActivity::class.java)
Expand Down Expand Up @@ -96,13 +96,6 @@ object JumpUitl {
}

fun startActivity(context: Context, intent: Intent) {
if (context is Activity) {
val activityOptions = ActivityOptionsCompat.makeSceneTransitionAnimation(context)
ActivityCompat.startActivity(context, intent, activityOptions.toBundle())
} else {
context.startActivity(intent)
}
context.startActivity(intent)
}


}
Loading

0 comments on commit c186e89

Please sign in to comment.