Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release' into dev

Browse Source
This commit is contained in:
chenjuntao
2022-08-30 14:10:14 +08:00
parent 0821f00584 fc705578b7
commit 7dd0bdfd73
3 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
app/src/main/java/com/gh/gamecenter/ImageViewerActivity.kt
View File

@ -368,7 +368,7 @@ class ImageViewerActivity : BaseActivity(), OnPageChangeListener {
if (mUseEnterAndExitAnimation) {
mBigImageView?.translationX = mTranslationX
mBigImageView?.translationY = mTranslationY
if (mScaleX < Float.MAX_VALUE) {
if (!mScaleX.isNaN() && mScaleX < Float.MAX_VALUE) {
mBigImageView?.scaleX = mScaleX
mBigImageView?.scaleY = mScaleY
}
@ -439,10 +439,18 @@ class ImageViewerActivity : BaseActivity(), OnPageChangeListener {
addUpdateListener { va -> mBigImageView?.y = (va.animatedValue as Float) }
}
val scaleYAnimator = ValueAnimator.ofFloat(1F, mScaleY).apply {
addUpdateListener { va -> mBigImageView?.scaleY = (va.animatedValue as Float) }
addUpdateListener { va ->
if (va.animatedValue is Float && !(va.animatedValue as Float).isNaN() && (va.animatedValue as Float) < Float.MAX_VALUE) {
mBigImageView?.scaleY = (va.animatedValue as Float)
}
}
}
val scaleXAnimator = ValueAnimator.ofFloat(1F, mScaleX).apply {
addUpdateListener { va -> mBigImageView?.scaleX = (va.animatedValue as Float) }
addUpdateListener { va ->
if (va.animatedValue is Float && !(va.animatedValue as Float).isNaN() && (va.animatedValue as Float) < Float.MAX_VALUE) {
mBigImageView?.scaleX = (va.animatedValue as Float)
}
}
}
val backgroundAlphaAnimation = ValueAnimator.ofFloat(1F, 0F).apply {
addUpdateListener { va -> mBackgroundView.alpha = (va.animatedValue as Float) }
@ -591,10 +599,18 @@ class ImageViewerActivity : BaseActivity(), OnPageChangeListener {
addUpdateListener { va -> mBigImageView?.y = (va.animatedValue as Float) }
}
val scaleYAnimator = ValueAnimator.ofFloat(mScaleY, 1F).apply {
addUpdateListener { va -> mBigImageView?.scaleY = (va.animatedValue as Float) }
addUpdateListener { va ->
if (va.animatedValue is Float && !(va.animatedValue as Float).isNaN() && (va.animatedValue as Float) < Float.MAX_VALUE) {
mBigImageView?.scaleY = (va.animatedValue as Float)
}
}
}
val scaleXAnimator = ValueAnimator.ofFloat(mScaleX, 1F).apply {
addUpdateListener { va -> mBigImageView?.scaleX = (va.animatedValue as Float) }
addUpdateListener { va ->
if (va.animatedValue is Float && !(va.animatedValue as Float).isNaN() && (va.animatedValue as Float) < Float.MAX_VALUE) {
mBigImageView?.scaleX = (va.animatedValue as Float)
}
}
}
val backgroundAlphaAnimator = ValueAnimator.ofFloat(0F, 1F).apply {
addUpdateListener { va -> mBackgroundView.alpha = (va.animatedValue as Float) }
@ -625,8 +641,10 @@ class ImageViewerActivity : BaseActivity(), OnPageChangeListener {
val scaleAnimator = ValueAnimator.ofFloat(scale, finalScale).apply {
addUpdateListener { va ->
view.scaleX = (va.animatedValue as Float)
view.scaleY = (va.animatedValue as Float)
if (va.animatedValue is Float && !(va.animatedValue as Float).isNaN() && (va.animatedValue as Float) < Float.MAX_VALUE) {
view.scaleX = (va.animatedValue as Float)
view.scaleY = (va.animatedValue as Float)
}
}
}
val translateXAnimator = ValueAnimator.ofFloat(view.x, finalTranslationX).apply {

2
app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListFragment.kt
View File

@ -269,7 +269,7 @@ class ForumArticleAskListFragment : LazyListFragment<AnswerEntity, ForumArticleA
}
override fun scrollToTop() {
mListRv.scrollToPosition(0)
mListRv?.scrollToPosition(0)
}
override fun addSyncPageObserver(): Boolean = true

2
app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt
View File

@ -479,6 +479,7 @@ class GameDetailFragment : ToolbarFragment(), IScrollable {
private fun initGameSubtitle(gameTitleTv: TextView, gameSubtitle: String, gameSubtitleStyle: TagStyleEntity? = null, advanceDownload: Boolean = false) {
gameTitleTv.post {
if (!isAdded) return@post
gameTitleTv.run {
var lastPosX = 0F
tryCatchInRelease {
@ -552,6 +553,7 @@ class GameDetailFragment : ToolbarFragment(), IScrollable {
}
private fun subtractGameNameIfNeeded(textView: TextView, name: CharSequence, tagLayout: FrameLayout) {
if (!isAdded) return
textView.run {
if (lineCount > 2 || (layout != null && layout.getEllipsisCount(1) > 0)) {
val displayName = name.substring(0, name.length - 2) + "…"