Mastodon
/
Twidere-App-Android-Twitter-Mastodon
mirror of https://github.com/TwidereProject/Twidere-Android
1
0
Fork 0
Code Issues Releases Wiki Activity

code style tweaks

This commit is contained in:
Mariotaku Lee 2017-09-20 17:52:09 +08:00
parent af1dbfd303
commit efebd94e55
No known key found for this signature in database
GPG Key ID: 15C10F89D7C33535
4 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/ParcelableMediaExtensions.kt
View File

@ -2,6 +2,7 @@ package org.mariotaku.twidere.extension.model
import android.annotation.SuppressLint
import org.mariotaku.twidere.model.ParcelableMedia
import org.mariotaku.twidere.util.promotion.PromotionService
/**
* Created by mariotaku on 2017/1/7.
@ -42,4 +43,10 @@ val ParcelableMedia.aspect_ratio: Double
get() {
if (this.height <= 0 || this.width <= 0) return Double.NaN
return this.width / this.height.toDouble()
}
val ParcelableMedia.bannerExtras: PromotionService.BannerExtras?
get() {
val contentUrl = this.page_url ?: this.url ?: return null
return PromotionService.BannerExtras(contentUrl)
}

3
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/ExoPlayerPageFragment.kt
View File

@ -56,6 +56,7 @@ import org.mariotaku.twidere.activity.MediaViewerActivity
import org.mariotaku.twidere.annotation.CacheFileType
import org.mariotaku.twidere.constant.IntentConstants.EXTRA_POSITION
import org.mariotaku.twidere.extension.model.authorizationHeader
import org.mariotaku.twidere.extension.model.bannerExtras
import org.mariotaku.twidere.extension.model.getBestVideoUrlAndType
import org.mariotaku.twidere.extension.setVisible
import org.mariotaku.twidere.fragment.iface.IBaseFragment
@ -216,7 +217,7 @@ class ExoPlayerPageFragment : MediaViewerFragment(), IBaseFragment<ExoPlayerPage
}
updateVolume()
promotionService.loadBanner(adContainer)
promotionService.loadBanner(adContainer, media?.bannerExtras)
}
override fun onAttach(context: Context) {

3
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/VideoPageFragment.kt
View File

@ -49,6 +49,7 @@ import org.mariotaku.twidere.TwidereConstants.EXTRA_MEDIA
import org.mariotaku.twidere.activity.MediaViewerActivity
import org.mariotaku.twidere.activity.iface.IControlBarActivity
import org.mariotaku.twidere.constant.IntentConstants.EXTRA_POSITION
import org.mariotaku.twidere.extension.model.bannerExtras
import org.mariotaku.twidere.extension.model.getBestVideoUrlAndType
import org.mariotaku.twidere.extension.setVisible
import org.mariotaku.twidere.fragment.iface.IBaseFragment
@ -142,7 +143,7 @@ class VideoPageFragment : CacheDownloadMediaViewerFragment(), IBaseFragment<Vide
setMediaViewVisible(false)
updateVolume()
promotionService.loadBanner(adContainer)
promotionService.loadBanner(adContainer, media?.bannerExtras)
}
override fun onPause() {

12
twidere/src/main/kotlin/org/mariotaku/twidere/model/util/ParcelableMediaUtils.kt
View File

@ -144,19 +144,16 @@ object ParcelableMediaUtils {
}
fun hasPlayIcon(@ParcelableMedia.Type type: Int): Boolean {
when (type) {
return when (type) {
ParcelableMedia.Type.VIDEO, ParcelableMedia.Type.ANIMATED_GIF,
ParcelableMedia.Type.CARD_ANIMATED_GIF, ParcelableMedia.Type.EXTERNAL_PLAYER -> return true
else -> return false
ParcelableMedia.Type.CARD_ANIMATED_GIF, ParcelableMedia.Type.EXTERNAL_PLAYER -> true
else -> false
}
}
fun findByUrl(media: Array<ParcelableMedia>?, url: String?): ParcelableMedia? {
if (media == null || url == null) return null
for (item in media) {
if (url == item.url) return item
}
return null
return media.firstOrNull { url == it.url }
}
fun getPrimaryMedia(status: ParcelableStatus): Array<ParcelableMedia>? {
@ -173,4 +170,5 @@ object ParcelableMediaUtils {
status.quoted_media?.addAllTo(result)
return result.toTypedArray()
}
}