diff --git a/library/build.gradle b/library/build.gradle index 793d0c5d..3f2c3419 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -26,12 +26,17 @@ android { exclude 'META-INF/LICENSE.txt' exclude 'META-INF/MANIFEST.MF' } + + lintOptions { + abortOnError false + } } dependencies { - implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.squareup.wire:wire-runtime:2.3.0-RC1' + provided fileTree(include: ['*.jar'], dir: 'libs') +// implementation 'com.squareup.wire:wire-runtime:3.0.0-alpha01' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation 'com.squareup.okio:okio:2.2.2' } repositories { mavenCentral() diff --git a/library/libs/wire-runtime-jvm-3.0.0-alpha02.jar b/library/libs/wire-runtime-jvm-3.0.0-alpha02.jar new file mode 100644 index 00000000..83a0ce21 Binary files /dev/null and b/library/libs/wire-runtime-jvm-3.0.0-alpha02.jar differ diff --git a/library/src/main/java/com/opensource/svgaplayer/SVGADynamicEntity.kt b/library/src/main/java/com/opensource/svgaplayer/SVGADynamicEntity.kt index 4b5ac5e4..66126606 100644 --- a/library/src/main/java/com/opensource/svgaplayer/SVGADynamicEntity.kt +++ b/library/src/main/java/com/opensource/svgaplayer/SVGADynamicEntity.kt @@ -27,15 +27,16 @@ class SVGADynamicEntity { internal var dynamicBoringLayoutText: HashMap = hashMapOf() - internal var dynamicDrawer: HashMap Boolean> = hashMapOf() - + internal var dynamicDrawer: HashMap Boolean> = + hashMapOf() //点击事件回调map - internal var mClickMap : HashMap = hashMapOf() + internal var mClickMap: HashMap = hashMapOf() internal var dynamicIClickArea: HashMap = hashMapOf() - internal var dynamicDrawerSized: HashMap Boolean> = hashMapOf() + internal var dynamicDrawerSized: HashMap Boolean> = + hashMapOf() internal var isTextDirty = false @@ -50,7 +51,30 @@ class SVGADynamicEntity { fun setDynamicImage(url: String, forKey: String) { val handler = android.os.Handler() - SVGAParser.threadPoolExecutor.execute { +// SVGAParser.threadPoolExecutor.execute { +// (URL(url).openConnection() as? HttpURLConnection)?.let { +// try { +// it.connectTimeout = 20 * 1000 +// it.requestMethod = "GET" +// it.connect() +// it.inputStream.use { stream -> +// BitmapFactory.decodeStream(stream)?.let { +// handler.post { setDynamicImage(it, forKey) } +// } +// } +// } catch (e: Exception) { +// e.printStackTrace() +// } finally { +// try { +// it.disconnect() +// } catch (disconnectException: Throwable) { +// // ignored here +// } +// } +// } +// +// } + SVGAExecutorService.executorTask(Runnable { (URL(url).openConnection() as? HttpURLConnection)?.let { try { it.connectTimeout = 20 * 1000 @@ -71,7 +95,7 @@ class SVGADynamicEntity { } } } - } + }) } fun setDynamicText(text: String, textPaint: TextPaint, forKey: String) { @@ -87,8 +111,8 @@ class SVGADynamicEntity { fun setDynamicText(layoutText: BoringLayout, forKey: String) { this.isTextDirty = true - BoringLayout.isBoring(layoutText.text,layoutText.paint)?.let { - this.dynamicBoringLayoutText.put(forKey,layoutText) + BoringLayout.isBoring(layoutText.text, layoutText.paint)?.let { + this.dynamicBoringLayoutText.put(forKey, layoutText) } } @@ -97,13 +121,13 @@ class SVGADynamicEntity { } fun setClickArea(clickKey: List) { - for(itemKey in clickKey){ - dynamicIClickArea.put(itemKey,object : IClickAreaListener{ + for (itemKey in clickKey) { + dynamicIClickArea.put(itemKey, object : IClickAreaListener { override fun onResponseArea(key: String, x0: Int, y0: Int, x1: Int, y1: Int) { mClickMap.let { - if(it.get(key) == null){ - it.put(key, intArrayOf(x0,y0,x1,y1)) - }else{ + if (it.get(key) == null) { + it.put(key, intArrayOf(x0, y0, x1, y1)) + } else { it.get(key)?.let { it[0] = x0 it[1] = y0 @@ -136,7 +160,10 @@ class SVGADynamicEntity { }) } - fun setDynamicDrawerSized(drawer: (canvas: Canvas, frameIndex: Int, width: Int, height: Int) -> Boolean, forKey: String) { + fun setDynamicDrawerSized( + drawer: (canvas: Canvas, frameIndex: Int, width: Int, height: Int) -> Boolean, + forKey: String + ) { this.dynamicDrawerSized.put(forKey, drawer) } diff --git a/library/src/main/java/com/opensource/svgaplayer/SVGAExecutorService.kt b/library/src/main/java/com/opensource/svgaplayer/SVGAExecutorService.kt new file mode 100644 index 00000000..e69b4fb8 --- /dev/null +++ b/library/src/main/java/com/opensource/svgaplayer/SVGAExecutorService.kt @@ -0,0 +1,29 @@ +package com.opensource.svgaplayer + +import java.util.concurrent.Executor + +/** + * Created by huangzhilong on 2019-07-23. + * 设置线程池,没设置则new thread（原来逻辑） + */ + +class SVGAExecutorService { + + companion object { + + private var mExecutorService: Executor? = null + + fun setExecutorService(executorService: Executor?) { + mExecutorService = executorService + } + + fun executorTask(runnable: Runnable) { + if (mExecutorService != null) { + mExecutorService?.execute(runnable) + } else { + var thread = Thread(runnable) + thread.start() + } + } + } +} \ No newline at end of file diff --git a/library/src/main/java/com/opensource/svgaplayer/SVGAImageView.kt b/library/src/main/java/com/opensource/svgaplayer/SVGAImageView.kt index cca4c26d..68b4499b 100644 --- a/library/src/main/java/com/opensource/svgaplayer/SVGAImageView.kt +++ b/library/src/main/java/com/opensource/svgaplayer/SVGAImageView.kt @@ -40,7 +40,7 @@ open class SVGAImageView : ImageView { private var animator: ValueAnimator? = null - private var mItemClickAreaListener : SVGAClickAreaListener? = null + private var mItemClickAreaListener: SVGAClickAreaListener? = null constructor(context: Context?) : super(context) { setSoftwareLayerType() @@ -51,12 +51,15 @@ open class SVGAImageView : ImageView { attrs?.let { loadAttrs(it) } } - constructor(context: Context?, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr) { + constructor(context: Context?, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, + defStyleAttr) { setSoftwareLayerType() attrs?.let { loadAttrs(it) } } - constructor(context: Context?, attrs: AttributeSet?, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes) { + constructor( + context: Context?, attrs: AttributeSet?, defStyleAttr: Int, defStyleRes: Int + ) : super(context, attrs, defStyleAttr, defStyleRes) { setSoftwareLayerType() attrs?.let { loadAttrs(it) } } @@ -75,7 +78,8 @@ open class SVGAImageView : ImageView { } private fun loadAttrs(attrs: AttributeSet) { - val typedArray = context.theme.obtainStyledAttributes(attrs, R.styleable.SVGAImageView, 0, 0) + val typedArray = + context.theme.obtainStyledAttributes(attrs, R.styleable.SVGAImageView, 0, 0) loops = typedArray.getInt(R.styleable.SVGAImageView_loopCount, 0) clearsAfterStop = typedArray.getBoolean(R.styleable.SVGAImageView_clearsAfterStop, true) val antiAlias = typedArray.getBoolean(R.styleable.SVGAImageView_antiAlias, true) @@ -83,14 +87,35 @@ open class SVGAImageView : ImageView { typedArray.getString(R.styleable.SVGAImageView_fillMode)?.let { if (it == "0") { fillMode = FillMode.Backward - } - else if (it == "1") { + } else if (it == "1") { fillMode = FillMode.Forward } } typedArray.getString(R.styleable.SVGAImageView_source)?.let { val parser = SVGAParser(context) - Thread { +// Thread { +// val callback: SVGAParser.ParseCompletion = object : SVGAParser.ParseCompletion { +// override fun onComplete(videoItem: SVGAVideoEntity) { +// this@SVGAImageView.post { +// videoItem.antiAlias = antiAlias +// setVideoItem(videoItem) +// (drawable as? SVGADrawable)?.scaleType = scaleType +// if (autoPlay) { +// startAnimation() +// } +// } +// } +// +// override fun onError() {} +// } +// if (it.startsWith("http://") || it.startsWith("https://")) { +// parser.parse(URL(it), callback) +// } else { +// parser.parse(it, callback) +// } +// }.start() + + SVGAExecutorService.executorTask(Runnable { val callback: SVGAParser.ParseCompletion = object : SVGAParser.ParseCompletion { override fun onComplete(videoItem: SVGAVideoEntity) { this@SVGAImageView.post { @@ -105,13 +130,16 @@ open class SVGAImageView : ImageView { override fun onError() {} } - if(it.startsWith("http://") || it.startsWith("https://")) { + if (it.startsWith("http://") || it.startsWith("https://")) { parser.parse(URL(it), callback) } else { parser.parse(it, callback) } - }.start() + + }) } + + typedArray.recycle() } @@ -127,7 +155,8 @@ open class SVGAImageView : ImageView { drawable.videoItem.let { var durationScale = 1.0 val startFrame = Math.max(0, range?.location ?: 0) - val endFrame = Math.min(it.frames - 1, ((range?.location ?: 0) + (range?.length ?: Int.MAX_VALUE) - 1)) + val endFrame = Math.min(it.frames - 1, + ((range?.location ?: 0) + (range?.length ?: Int.MAX_VALUE) - 1)) val animator = ValueAnimator.ofInt(startFrame, endFrame) try { val animatorClass = Class.forName("android.animation.ValueAnimator") @@ -140,46 +169,51 @@ open class SVGAImageView : ImageView { if (durationScale == 0.0) { it.setFloat(animatorClass, 1.0f) durationScale = 1.0 - Log.e("SVGAPlayer", "The animation duration scale has been reset to 1.0x, because you closed it on developer options.") + Log.e("SVGAPlayer", + "The animation duration scale has been reset to 1.0x, because you closed it on developer options.") } } } - } catch (e: Exception) {} + } catch (e: Exception) { + } animator.interpolator = LinearInterpolator() - animator.duration = ((endFrame - startFrame + 1) * (1000 / it.FPS) / durationScale).toLong() + animator.duration = + ((endFrame - startFrame + 1) * (1000 / it.FPS) / durationScale).toLong() animator.repeatCount = if (loops <= 0) 99999 else loops - 1 animator.addUpdateListener { drawable.currentFrame = animator.animatedValue as Int - callback?.onStep(drawable.currentFrame, ((drawable.currentFrame + 1).toDouble() / drawable.videoItem.frames.toDouble())) + callback?.onStep(drawable.currentFrame, + ((drawable.currentFrame + 1).toDouble() / drawable.videoItem.frames.toDouble())) } animator.addListener(object : Animator.AnimatorListener { override fun onAnimationRepeat(animation: Animator?) { callback?.onRepeat() } + override fun onAnimationEnd(animation: Animator?) { isAnimating = false stopAnimation() if (!clearsAfterStop) { if (fillMode == FillMode.Backward) { drawable.currentFrame = startFrame - } - else if (fillMode == FillMode.Forward) { + } else if (fillMode == FillMode.Forward) { drawable.currentFrame = endFrame } } callback?.onFinished() } + override fun onAnimationCancel(animation: Animator?) { isAnimating = false } + override fun onAnimationStart(animation: Animator?) { isAnimating = true } }) if (reverse) { animator.reverse() - } - else { + } else { animator.start() } this.animator = animator @@ -225,7 +259,8 @@ open class SVGAImageView : ImageView { if (andPlay) { startAnimation() animator?.let { - it.currentPlayTime = (Math.max(0.0f, Math.min(1.0f, (frame.toFloat() / drawable.videoItem.frames.toFloat()))) * it.duration).toLong() + it.currentPlayTime = (Math.max(0.0f, Math.min(1.0f, + (frame.toFloat() / drawable.videoItem.frames.toFloat()))) * it.duration).toLong() } } } @@ -239,16 +274,16 @@ open class SVGAImageView : ImageView { stepToFrame(frame, andPlay) } - fun setOnAnimKeyClickListener(clickListener : SVGAClickAreaListener){ + fun setOnAnimKeyClickListener(clickListener: SVGAClickAreaListener) { mItemClickAreaListener = clickListener } @SuppressLint("ClickableViewAccessibility") override fun onTouchEvent(event: MotionEvent?): Boolean { event?.let { - if(event.action == MotionEvent.ACTION_DOWN){ + if (event.action == MotionEvent.ACTION_DOWN) { val drawable = drawable as? SVGADrawable ?: return false - for((key,value) in drawable.dynamicItem.mClickMap){ + for ((key, value) in drawable.dynamicItem.mClickMap) { if (event.x >= value[0] && event.x <= value[2] && event.y >= value[1] && event.y <= value[3]) { mItemClickAreaListener?.let { it.onClick(key) @@ -256,13 +291,9 @@ open class SVGAImageView : ImageView { } } } - - - } } return super.onTouchEvent(event) } - } diff --git a/library/src/main/java/com/opensource/svgaplayer/SVGAParser.kt b/library/src/main/java/com/opensource/svgaplayer/SVGAParser.kt index caef9192..0bd88713 100644 --- a/library/src/main/java/com/opensource/svgaplayer/SVGAParser.kt +++ b/library/src/main/java/com/opensource/svgaplayer/SVGAParser.kt @@ -6,13 +6,16 @@ import android.os.Handler import android.util.Log import com.opensource.svgaplayer.proto.MovieEntity import org.json.JSONObject -import java.io.* +import java.io.BufferedInputStream +import java.io.ByteArrayInputStream +import java.io.ByteArrayOutputStream +import java.io.File +import java.io.FileInputStream +import java.io.FileOutputStream +import java.io.InputStream import java.net.HttpURLConnection import java.net.URL import java.security.MessageDigest -import java.util.concurrent.LinkedBlockingQueue -import java.util.concurrent.ThreadPoolExecutor -import java.util.concurrent.TimeUnit import java.util.zip.Inflater import java.util.zip.ZipInputStream @@ -28,23 +31,27 @@ class SVGAParser(private val context: Context) { fun onComplete(videoItem: SVGAVideoEntity) fun onError() - } open class FileDownloader { var noCache = false - open fun resume(url: URL, complete: (inputStream: InputStream) -> Unit, failure: (e: Exception) -> Unit): () -> Unit { + open fun resume( + url: URL, complete: (inputStream: InputStream) -> Unit, failure: (e: Exception) -> Unit + ): () -> Unit { var cancelled = false val cancelBlock = { cancelled = true } - threadPoolExecutor.execute { + + SVGAExecutorService.executorTask(Runnable { try { if (HttpResponseCache.getInstalled() == null && !noCache) { - Log.e("SVGAParser", "SVGAParser can not handle cache before install HttpResponseCache. see https://github.com/yyued/SVGAPlayer-Android#cache") - Log.e("SVGAParser", "在配置 HttpResponseCache 前 SVGAParser 无法缓存. 查看 https://github.com/yyued/SVGAPlayer-Android#cache ") + Log.e("SVGAParser", + "SVGAParser can not handle cache before install HttpResponseCache. see https://github.com/yyued/SVGAPlayer-Android#cache") + Log.e("SVGAParser", + "在配置 HttpResponseCache 前 SVGAParser 无法缓存. 查看 https://github.com/yyued/SVGAPlayer-Android#cache ") } (url.openConnection() as? HttpURLConnection)?.let { it.connectTimeout = 20 * 1000 @@ -65,7 +72,7 @@ class SVGAParser(private val context: Context) { outputStream.write(buffer, 0, count) } if (cancelled) { - return@execute + return@Runnable } ByteArrayInputStream(outputStream.toByteArray()).use { complete(it) @@ -77,41 +84,87 @@ class SVGAParser(private val context: Context) { e.printStackTrace() failure(e) } - } + + }) + +// threadPoolExecutor.execute { +// try { +// if (HttpResponseCache.getInstalled() == null && !noCache) { +// Log.e("SVGAParser", +// "SVGAParser can not handle cache before install HttpResponseCache. see https://github.com/yyued/SVGAPlayer-Android#cache") +// Log.e("SVGAParser", +// "在配置 HttpResponseCache 前 SVGAParser 无法缓存. 查看 https://github.com/yyued/SVGAPlayer-Android#cache ") +// } +// (url.openConnection() as? HttpURLConnection)?.let { +// it.connectTimeout = 20 * 1000 +// it.requestMethod = "GET" +// it.connect() +// it.inputStream.use { inputStream -> +// ByteArrayOutputStream().use { outputStream -> +// val buffer = ByteArray(4096) +// var count: Int +// while (true) { +// if (cancelled) { +// break +// } +// count = inputStream.read(buffer, 0, 4096) +// if (count == -1) { +// break +// } +// outputStream.write(buffer, 0, count) +// } +// if (cancelled) { +// return@execute +// } +// ByteArrayInputStream(outputStream.toByteArray()).use { +// complete(it) +// } +// } +// } +// } +// } catch (e: Exception) { +// e.printStackTrace() +// failure(e) +// } +// +// } return cancelBlock } - } var fileDownloader = FileDownloader() - companion object { - private val threadPoolBlockingQueue = LinkedBlockingQueue() - internal var threadPoolExecutor = ThreadPoolExecutor(3, 10, 60000, TimeUnit.MILLISECONDS, threadPoolBlockingQueue) - fun setThreadPoolExecutor(executor: ThreadPoolExecutor) { - threadPoolExecutor = executor - } - } +// companion object { +// private val threadPoolBlockingQueue = LinkedBlockingQueue() +// internal var threadPoolExecutor = +// ThreadPoolExecutor(3, 10, 60000, TimeUnit.MILLISECONDS, threadPoolBlockingQueue) +// +// fun setThreadPoolExecutor(executor: ThreadPoolExecutor) { +// threadPoolExecutor = executor +// } +// } fun decodeFromAssets(name: String, callback: ParseCompletion?) { try { context.assets.open(name)?.let { - this.decodeFromInputStream(it, buildCacheKey("file:///assets/$name"), callback, true) + this.decodeFromInputStream(it, buildCacheKey("file:///assets/$name"), callback, + true) } - } - catch (e: java.lang.Exception) { + } catch (e: java.lang.Exception) { this.invokeErrorCallback(e, callback) } } fun decodeFromURL(url: URL, callback: ParseCompletion?): (() -> Unit)? { if (this.isCached(buildCacheKey(url))) { - threadPoolExecutor.execute { +// threadPoolExecutor.execute { +// this.decodeFromCacheKey(buildCacheKey(url), callback) +// } + SVGAExecutorService.executorTask(Runnable { this.decodeFromCacheKey(buildCacheKey(url), callback) - } + }) return null - } - else { + } else { return fileDownloader.resume(url, { this.decodeFromInputStream(it, this.buildCacheKey(url), callback) }, { @@ -120,8 +173,12 @@ class SVGAParser(private val context: Context) { } } - fun decodeFromInputStream(inputStream: InputStream, cacheKey: String, callback: ParseCompletion?, closeInputStream: Boolean = false) { - threadPoolExecutor.execute { + fun decodeFromInputStream( + inputStream: InputStream, cacheKey: String, callback: ParseCompletion?, + closeInputStream: Boolean = false + ) { + + SVGAExecutorService.executorTask(Runnable { try { readAsBytes(inputStream)?.let { bytes -> if (bytes.size > 4 && bytes[0].toInt() == 80 && bytes[1].toInt() == 75 && bytes[2].toInt() == 3 && bytes[3].toInt() == 4) { @@ -131,10 +188,10 @@ class SVGAParser(private val context: Context) { } } this.decodeFromCacheKey(cacheKey, callback) - } - else { + } else { inflate(bytes)?.let { - val videoItem = SVGAVideoEntity(MovieEntity.ADAPTER.decode(it), File(cacheKey)) + val videoItem = + SVGAVideoEntity(MovieEntity.ADAPTER.decode(it), File(cacheKey)) videoItem.prepare { this.invokeCompleteCallback(videoItem, callback) } @@ -148,13 +205,43 @@ class SVGAParser(private val context: Context) { inputStream.close() } } - } + + }) +// threadPoolExecutor.execute { +// try { +// readAsBytes(inputStream)?.let { bytes -> +// if (bytes.size > 4 && bytes[0].toInt() == 80 && bytes[1].toInt() == 75 && bytes[2].toInt() == 3 && bytes[3].toInt() == 4) { +// if (!buildCacheDir(cacheKey).exists()) { +// ByteArrayInputStream(bytes).use { +// unzip(it, cacheKey) +// } +// } +// this.decodeFromCacheKey(cacheKey, callback) +// } else { +// inflate(bytes)?.let { +// val videoItem = +// SVGAVideoEntity(MovieEntity.ADAPTER.decode(it), File(cacheKey)) +// videoItem.prepare { +// this.invokeCompleteCallback(videoItem, callback) +// } +// } +// } +// } +// } catch (e: java.lang.Exception) { +// this.invokeErrorCallback(e, callback) +// } finally { +// if (closeInputStream) { +// inputStream.close() +// } +// } +// } } /** * @deprecated from 2.4.0 */ - @Deprecated("This method has been deprecated from 2.4.0.", ReplaceWith("this.decodeFromAssets(assetsName, callback)")) + @Deprecated("This method has been deprecated from 2.4.0.", + ReplaceWith("this.decodeFromAssets(assetsName, callback)")) fun parse(assetsName: String, callback: ParseCompletion?) { this.decodeFromAssets(assetsName, callback) } @@ -162,7 +249,8 @@ class SVGAParser(private val context: Context) { /** * @deprecated from 2.4.0 */ - @Deprecated("This method has been deprecated from 2.4.0.", ReplaceWith("this.decodeFromURL(url, callback)")) + @Deprecated("This method has been deprecated from 2.4.0.", + ReplaceWith("this.decodeFromURL(url, callback)")) fun parse(url: URL, callback: ParseCompletion?) { this.decodeFromURL(url, callback) } @@ -170,8 +258,12 @@ class SVGAParser(private val context: Context) { /** * @deprecated from 2.4.0 */ - @Deprecated("This method has been deprecated from 2.4.0.", ReplaceWith("this.decodeFromInputStream(inputStream, cacheKey, callback, closeInputStream)")) - fun parse(inputStream: InputStream, cacheKey: String, callback: ParseCompletion?, closeInputStream: Boolean = false) { + @Deprecated("This method has been deprecated from 2.4.0.", ReplaceWith( + "this.decodeFromInputStream(inputStream, cacheKey, callback, closeInputStream)")) + fun parse( + inputStream: InputStream, cacheKey: String, callback: ParseCompletion?, + closeInputStream: Boolean = false + ) { this.decodeFromInputStream(inputStream, cacheKey, callback, closeInputStream) } @@ -198,7 +290,11 @@ class SVGAParser(private val context: Context) { File(cacheDir, "movie.binary").takeIf { it.isFile }?.let { binaryFile -> try { FileInputStream(binaryFile).use { - this.invokeCompleteCallback(SVGAVideoEntity(MovieEntity.ADAPTER.decode(it), cacheDir), callback) + readAsBytes(it)?.let { + this.invokeCompleteCallback( + SVGAVideoEntity(MovieEntity.ADAPTER.decode(it), cacheDir), callback) + } +// this.invokeCompleteCallback(SVGAVideoEntity(MovieEntity.ADAPTER.decode(it), cacheDir), callback) } } catch (e: Exception) { cacheDir.delete() @@ -220,7 +316,8 @@ class SVGAParser(private val context: Context) { } byteArrayOutputStream.toString().let { JSONObject(it).let { - this.invokeCompleteCallback(SVGAVideoEntity(it, cacheDir), callback) + this.invokeCompleteCallback(SVGAVideoEntity(it, cacheDir), + callback) } } } @@ -249,7 +346,8 @@ class SVGAParser(private val context: Context) { private fun buildCacheKey(url: URL): String = buildCacheKey(url.toString()) - private fun buildCacheDir(cacheKey: String): File = File(context.cacheDir.absolutePath + "/" + cacheKey + "/") + private fun buildCacheDir(cacheKey: String): File = + File(context.cacheDir.absolutePath + "/" + cacheKey + "/") private fun readAsBytes(inputStream: InputStream): ByteArray? { ByteArrayOutputStream().use { byteArrayOutputStream -> @@ -258,8 +356,7 @@ class SVGAParser(private val context: Context) { val count = inputStream.read(byteArray, 0, 2048) if (count <= 0) { break - } - else { + } else { byteArrayOutputStream.write(byteArray, 0, count) } } @@ -276,8 +373,7 @@ class SVGAParser(private val context: Context) { val count = inflater.inflate(inflatedBytes, 0, 2048) if (count <= 0) { break - } - else { + } else { inflatedOutputStream.write(inflatedBytes, 0, count) } } diff --git a/library/src/main/java/com/opensource/svgaplayer/proto/AudioEntity.java b/library/src/main/java/com/opensource/svgaplayer/proto/AudioEntity.java index d09adce9..a38edfcd 100644 --- a/library/src/main/java/com/opensource/svgaplayer/proto/AudioEntity.java +++ b/library/src/main/java/com/opensource/svgaplayer/proto/AudioEntity.java @@ -1,24 +1,24 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: svga.proto at 19:1 +// Source file: wire.proto package com.opensource.svgaplayer.proto; -import com.squareup.wire.FieldEncoding; +import android.os.Parcelable; +import com.squareup.wire.AndroidMessage; import com.squareup.wire.Message; import com.squareup.wire.ProtoAdapter; -import com.squareup.wire.ProtoReader; -import com.squareup.wire.ProtoWriter; +import com.squareup.wire.ProtoAdapterJvm; import com.squareup.wire.WireField; import com.squareup.wire.internal.Internal; -import java.io.IOException; import java.lang.Integer; import java.lang.Object; import java.lang.Override; import java.lang.String; -import java.lang.StringBuilder; import okio.ByteString; -public final class AudioEntity extends Message { - public static final ProtoAdapter ADAPTER = new ProtoAdapter_AudioEntity(); +public final class AudioEntity extends AndroidMessage { + public static final ProtoAdapter ADAPTER = ProtoAdapterJvm.newMessageAdapter(AudioEntity.class); + + public static final Creator CREATOR = AndroidMessage.newCreator(ADAPTER); private static final long serialVersionUID = 0L; @@ -77,11 +77,13 @@ public final class AudioEntity extends Message ) public final Integer totalTime; - public AudioEntity(String audioKey, Integer startFrame, Integer endFrame, Integer startTime, Integer totalTime) { + public AudioEntity(String audioKey, Integer startFrame, Integer endFrame, Integer startTime, + Integer totalTime) { this(audioKey, startFrame, endFrame, startTime, totalTime, ByteString.EMPTY); } - public AudioEntity(String audioKey, Integer startFrame, Integer endFrame, Integer startTime, Integer totalTime, ByteString unknownFields) { + public AudioEntity(String audioKey, Integer startFrame, Integer endFrame, Integer startTime, + Integer totalTime, ByteString unknownFields) { super(ADAPTER, unknownFields); this.audioKey = audioKey; this.startFrame = startFrame; @@ -130,17 +132,6 @@ public int hashCode() { return result; } - @Override - public String toString() { - StringBuilder builder = new StringBuilder(); - if (audioKey != null) builder.append(", audioKey=").append(audioKey); - if (startFrame != null) builder.append(", startFrame=").append(startFrame); - if (endFrame != null) builder.append(", endFrame=").append(endFrame); - if (startTime != null) builder.append(", startTime=").append(startTime); - if (totalTime != null) builder.append(", totalTime=").append(totalTime); - return builder.replace(0, 2, "AudioEntity{").append('}').toString(); - } - public static final class Builder extends Message.Builder { public String audioKey; @@ -200,59 +191,4 @@ public AudioEntity build() { return new AudioEntity(audioKey, startFrame, endFrame, startTime, totalTime, super.buildUnknownFields()); } } - - private static final class ProtoAdapter_AudioEntity extends ProtoAdapter { - ProtoAdapter_AudioEntity() { - super(FieldEncoding.LENGTH_DELIMITED, AudioEntity.class); - } - - @Override - public int encodedSize(AudioEntity value) { - return (value.audioKey != null ? ProtoAdapter.STRING.encodedSizeWithTag(1, value.audioKey) : 0) - + (value.startFrame != null ? ProtoAdapter.INT32.encodedSizeWithTag(2, value.startFrame) : 0) - + (value.endFrame != null ? ProtoAdapter.INT32.encodedSizeWithTag(3, value.endFrame) : 0) - + (value.startTime != null ? ProtoAdapter.INT32.encodedSizeWithTag(4, value.startTime) : 0) - + (value.totalTime != null ? ProtoAdapter.INT32.encodedSizeWithTag(5, value.totalTime) : 0) - + value.unknownFields().size(); - } - - @Override - public void encode(ProtoWriter writer, AudioEntity value) throws IOException { - if (value.audioKey != null) ProtoAdapter.STRING.encodeWithTag(writer, 1, value.audioKey); - if (value.startFrame != null) ProtoAdapter.INT32.encodeWithTag(writer, 2, value.startFrame); - if (value.endFrame != null) ProtoAdapter.INT32.encodeWithTag(writer, 3, value.endFrame); - if (value.startTime != null) ProtoAdapter.INT32.encodeWithTag(writer, 4, value.startTime); - if (value.totalTime != null) ProtoAdapter.INT32.encodeWithTag(writer, 5, value.totalTime); - writer.writeBytes(value.unknownFields()); - } - - @Override - public AudioEntity decode(ProtoReader reader) throws IOException { - Builder builder = new Builder(); - long token = reader.beginMessage(); - for (int tag; (tag = reader.nextTag()) != -1;) { - switch (tag) { - case 1: builder.audioKey(ProtoAdapter.STRING.decode(reader)); break; - case 2: builder.startFrame(ProtoAdapter.INT32.decode(reader)); break; - case 3: builder.endFrame(ProtoAdapter.INT32.decode(reader)); break; - case 4: builder.startTime(ProtoAdapter.INT32.decode(reader)); break; - case 5: builder.totalTime(ProtoAdapter.INT32.decode(reader)); break; - default: { - FieldEncoding fieldEncoding = reader.peekFieldEncoding(); - Object value = fieldEncoding.rawProtoAdapter().decode(reader); - builder.addUnknownField(tag, fieldEncoding, value); - } - } - } - reader.endMessage(token); - return builder.build(); - } - - @Override - public AudioEntity redact(AudioEntity value) { - Builder builder = value.newBuilder(); - builder.clearUnknownFields(); - return builder.build(); - } - } } diff --git a/library/src/main/java/com/opensource/svgaplayer/proto/FrameEntity.java b/library/src/main/java/com/opensource/svgaplayer/proto/FrameEntity.java index ac701bb4..05e403ba 100644 --- a/library/src/main/java/com/opensource/svgaplayer/proto/FrameEntity.java +++ b/library/src/main/java/com/opensource/svgaplayer/proto/FrameEntity.java @@ -1,25 +1,25 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: svga.proto at 115:1 +// Source file: wire.proto package com.opensource.svgaplayer.proto; -import com.squareup.wire.FieldEncoding; +import android.os.Parcelable; +import com.squareup.wire.AndroidMessage; import com.squareup.wire.Message; import com.squareup.wire.ProtoAdapter; -import com.squareup.wire.ProtoReader; -import com.squareup.wire.ProtoWriter; +import com.squareup.wire.ProtoAdapterJvm; import com.squareup.wire.WireField; import com.squareup.wire.internal.Internal; -import java.io.IOException; import java.lang.Float; import java.lang.Object; import java.lang.Override; import java.lang.String; -import java.lang.StringBuilder; import java.util.List; import okio.ByteString; -public final class FrameEntity extends Message { - public static final ProtoAdapter ADAPTER = new ProtoAdapter_FrameEntity(); +public final class FrameEntity extends AndroidMessage { + public static final ProtoAdapter ADAPTER = ProtoAdapterJvm.newMessageAdapter(FrameEntity.class); + + public static final Creator CREATOR = AndroidMessage.newCreator(ADAPTER); private static final long serialVersionUID = 0L; @@ -73,11 +73,13 @@ public final class FrameEntity extends Message ) public final List shapes; - public FrameEntity(Float alpha, Layout layout, Transform transform, String clipPath, List shapes) { + public FrameEntity(Float alpha, Layout layout, Transform transform, String clipPath, + List shapes) { this(alpha, layout, transform, clipPath, shapes, ByteString.EMPTY); } - public FrameEntity(Float alpha, Layout layout, Transform transform, String clipPath, List shapes, ByteString unknownFields) { + public FrameEntity(Float alpha, Layout layout, Transform transform, String clipPath, + List shapes, ByteString unknownFields) { super(ADAPTER, unknownFields); this.alpha = alpha; this.layout = layout; @@ -126,17 +128,6 @@ public int hashCode() { return result; } - @Override - public String toString() { - StringBuilder builder = new StringBuilder(); - if (alpha != null) builder.append(", alpha=").append(alpha); - if (layout != null) builder.append(", layout=").append(layout); - if (transform != null) builder.append(", transform=").append(transform); - if (clipPath != null) builder.append(", clipPath=").append(clipPath); - if (!shapes.isEmpty()) builder.append(", shapes=").append(shapes); - return builder.replace(0, 2, "FrameEntity{").append('}').toString(); - } - public static final class Builder extends Message.Builder { public Float alpha; @@ -198,62 +189,4 @@ public FrameEntity build() { return new FrameEntity(alpha, layout, transform, clipPath, shapes, super.buildUnknownFields()); } } - - private static final class ProtoAdapter_FrameEntity extends ProtoAdapter { - ProtoAdapter_FrameEntity() { - super(FieldEncoding.LENGTH_DELIMITED, FrameEntity.class); - } - - @Override - public int encodedSize(FrameEntity value) { - return (value.alpha != null ? ProtoAdapter.FLOAT.encodedSizeWithTag(1, value.alpha) : 0) - + (value.layout != null ? Layout.ADAPTER.encodedSizeWithTag(2, value.layout) : 0) - + (value.transform != null ? Transform.ADAPTER.encodedSizeWithTag(3, value.transform) : 0) - + (value.clipPath != null ? ProtoAdapter.STRING.encodedSizeWithTag(4, value.clipPath) : 0) - + ShapeEntity.ADAPTER.asRepeated().encodedSizeWithTag(5, value.shapes) - + value.unknownFields().size(); - } - - @Override - public void encode(ProtoWriter writer, FrameEntity value) throws IOException { - if (value.alpha != null) ProtoAdapter.FLOAT.encodeWithTag(writer, 1, value.alpha); - if (value.layout != null) Layout.ADAPTER.encodeWithTag(writer, 2, value.layout); - if (value.transform != null) Transform.ADAPTER.encodeWithTag(writer, 3, value.transform); - if (value.clipPath != null) ProtoAdapter.STRING.encodeWithTag(writer, 4, value.clipPath); - ShapeEntity.ADAPTER.asRepeated().encodeWithTag(writer, 5, value.shapes); - writer.writeBytes(value.unknownFields()); - } - - @Override - public FrameEntity decode(ProtoReader reader) throws IOException { - Builder builder = new Builder(); - long token = reader.beginMessage(); - for (int tag; (tag = reader.nextTag()) != -1;) { - switch (tag) { - case 1: builder.alpha(ProtoAdapter.FLOAT.decode(reader)); break; - case 2: builder.layout(Layout.ADAPTER.decode(reader)); break; - case 3: builder.transform(Transform.ADAPTER.decode(reader)); break; - case 4: builder.clipPath(ProtoAdapter.STRING.decode(reader)); break; - case 5: builder.shapes.add(ShapeEntity.ADAPTER.decode(reader)); break; - default: { - FieldEncoding fieldEncoding = reader.peekFieldEncoding(); - Object value = fieldEncoding.rawProtoAdapter().decode(reader); - builder.addUnknownField(tag, fieldEncoding, value); - } - } - } - reader.endMessage(token); - return builder.build(); - } - - @Override - public FrameEntity redact(FrameEntity value) { - Builder builder = value.newBuilder(); - if (builder.layout != null) builder.layout = Layout.ADAPTER.redact(builder.layout); - if (builder.transform != null) builder.transform = Transform.ADAPTER.redact(builder.transform); - Internal.redactElements(builder.shapes, ShapeEntity.ADAPTER); - builder.clearUnknownFields(); - return builder.build(); - } - } } diff --git a/library/src/main/java/com/opensource/svgaplayer/proto/Layout.java b/library/src/main/java/com/opensource/svgaplayer/proto/Layout.java index 6ea7edb6..9b9a4771 100644 --- a/library/src/main/java/com/opensource/svgaplayer/proto/Layout.java +++ b/library/src/main/java/com/opensource/svgaplayer/proto/Layout.java @@ -1,24 +1,23 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: svga.proto at 27:1 +// Source file: wire.proto package com.opensource.svgaplayer.proto; -import com.squareup.wire.FieldEncoding; +import android.os.Parcelable; +import com.squareup.wire.AndroidMessage; import com.squareup.wire.Message; import com.squareup.wire.ProtoAdapter; -import com.squareup.wire.ProtoReader; -import com.squareup.wire.ProtoWriter; +import com.squareup.wire.ProtoAdapterJvm; import com.squareup.wire.WireField; import com.squareup.wire.internal.Internal; -import java.io.IOException; import java.lang.Float; import java.lang.Object; import java.lang.Override; -import java.lang.String; -import java.lang.StringBuilder; import okio.ByteString; -public final class Layout extends Message { - public static final ProtoAdapter ADAPTER = new ProtoAdapter_Layout(); +public final class Layout extends AndroidMessage { + public static final ProtoAdapter ADAPTER = ProtoAdapterJvm.newMessageAdapter(Layout.class); + + public static final Creator CREATOR = AndroidMessage.newCreator(ADAPTER); private static final long serialVersionUID = 0L; @@ -103,16 +102,6 @@ public int hashCode() { return result; } - @Override - public String toString() { - StringBuilder builder = new StringBuilder(); - if (x != null) builder.append(", x=").append(x); - if (y != null) builder.append(", y=").append(y); - if (width != null) builder.append(", width=").append(width); - if (height != null) builder.append(", height=").append(height); - return builder.replace(0, 2, "Layout{").append('}').toString(); - } - public static final class Builder extends Message.Builder { public Float x; @@ -150,56 +139,4 @@ public Layout build() { return new Layout(x, y, width, height, super.buildUnknownFields()); } } - - private static final class ProtoAdapter_Layout extends ProtoAdapter { - ProtoAdapter_Layout() { - super(FieldEncoding.LENGTH_DELIMITED, Layout.class); - } - - @Override - public int encodedSize(Layout value) { - return (value.x != null ? ProtoAdapter.FLOAT.encodedSizeWithTag(1, value.x) : 0) - + (value.y != null ? ProtoAdapter.FLOAT.encodedSizeWithTag(2, value.y) : 0) - + (value.width != null ? ProtoAdapter.FLOAT.encodedSizeWithTag(3, value.width) : 0) - + (value.height != null ? ProtoAdapter.FLOAT.encodedSizeWithTag(4, value.height) : 0) - + value.unknownFields().size(); - } - - @Override - public void encode(ProtoWriter writer, Layout value) throws IOException { - if (value.x != null) ProtoAdapter.FLOAT.encodeWithTag(writer, 1, value.x); - if (value.y != null) ProtoAdapter.FLOAT.encodeWithTag(writer, 2, value.y); - if (value.width != null) ProtoAdapter.FLOAT.encodeWithTag(writer, 3, value.width); - if (value.height != null) ProtoAdapter.FLOAT.encodeWithTag(writer, 4, value.height); - writer.writeBytes(value.unknownFields()); - } - - @Override - public Layout decode(ProtoReader reader) throws IOException { - Builder builder = new Builder(); - long token = reader.beginMessage(); - for (int tag; (tag = reader.nextTag()) != -1;) { - switch (tag) { - case 1: builder.x(ProtoAdapter.FLOAT.decode(reader)); break; - case 2: builder.y(ProtoAdapter.FLOAT.decode(reader)); break; - case 3: builder.width(ProtoAdapter.FLOAT.decode(reader)); break; - case 4: builder.height(ProtoAdapter.FLOAT.decode(reader)); break; - default: { - FieldEncoding fieldEncoding = reader.peekFieldEncoding(); - Object value = fieldEncoding.rawProtoAdapter().decode(reader); - builder.addUnknownField(tag, fieldEncoding, value); - } - } - } - reader.endMessage(token); - return builder.build(); - } - - @Override - public Layout redact(Layout value) { - Builder builder = value.newBuilder(); - builder.clearUnknownFields(); - return builder.build(); - } - } } diff --git a/library/src/main/java/com/opensource/svgaplayer/proto/MovieEntity.java b/library/src/main/java/com/opensource/svgaplayer/proto/MovieEntity.java index 6b720af4..e92987bf 100644 --- a/library/src/main/java/com/opensource/svgaplayer/proto/MovieEntity.java +++ b/library/src/main/java/com/opensource/svgaplayer/proto/MovieEntity.java @@ -1,25 +1,25 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: svga.proto at 123:1 +// Source file: wire.proto package com.opensource.svgaplayer.proto; -import com.squareup.wire.FieldEncoding; +import android.os.Parcelable; +import com.squareup.wire.AndroidMessage; import com.squareup.wire.Message; import com.squareup.wire.ProtoAdapter; -import com.squareup.wire.ProtoReader; -import com.squareup.wire.ProtoWriter; +import com.squareup.wire.ProtoAdapterJvm; import com.squareup.wire.WireField; import com.squareup.wire.internal.Internal; -import java.io.IOException; import java.lang.Object; import java.lang.Override; import java.lang.String; -import java.lang.StringBuilder; import java.util.List; import java.util.Map; import okio.ByteString; -public final class MovieEntity extends Message { - public static final ProtoAdapter ADAPTER = new ProtoAdapter_MovieEntity(); +public final class MovieEntity extends AndroidMessage { + public static final ProtoAdapter ADAPTER = ProtoAdapterJvm.newMessageAdapter(MovieEntity.class); + + public static final Creator CREATOR = AndroidMessage.newCreator(ADAPTER); private static final long serialVersionUID = 0L; @@ -73,11 +73,13 @@ public final class MovieEntity extends Message ) public final List audios; - public MovieEntity(String version, MovieParams params, Map images, List sprites, List audios) { + public MovieEntity(String version, MovieParams params, Map images, + List sprites, List audios) { this(version, params, images, sprites, audios, ByteString.EMPTY); } - public MovieEntity(String version, MovieParams params, Map images, List sprites, List audios, ByteString unknownFields) { + public MovieEntity(String version, MovieParams params, Map images, + List sprites, List audios, ByteString unknownFields) { super(ADAPTER, unknownFields); this.version = version; this.params = params; @@ -126,17 +128,6 @@ public int hashCode() { return result; } - @Override - public String toString() { - StringBuilder builder = new StringBuilder(); - if (version != null) builder.append(", version=").append(version); - if (params != null) builder.append(", params=").append(params); - if (!images.isEmpty()) builder.append(", images=").append(images); - if (!sprites.isEmpty()) builder.append(", sprites=").append(sprites); - if (!audios.isEmpty()) builder.append(", audios=").append(audios); - return builder.replace(0, 2, "MovieEntity{").append('}').toString(); - } - public static final class Builder extends Message.Builder { public String version; @@ -202,64 +193,4 @@ public MovieEntity build() { return new MovieEntity(version, params, images, sprites, audios, super.buildUnknownFields()); } } - - private static final class ProtoAdapter_MovieEntity extends ProtoAdapter { - private final ProtoAdapter> images = ProtoAdapter.newMapAdapter(ProtoAdapter.STRING, ProtoAdapter.BYTES); - - ProtoAdapter_MovieEntity() { - super(FieldEncoding.LENGTH_DELIMITED, MovieEntity.class); - } - - @Override - public int encodedSize(MovieEntity value) { - return (value.version != null ? ProtoAdapter.STRING.encodedSizeWithTag(1, value.version) : 0) - + (value.params != null ? MovieParams.ADAPTER.encodedSizeWithTag(2, value.params) : 0) - + images.encodedSizeWithTag(3, value.images) - + SpriteEntity.ADAPTER.asRepeated().encodedSizeWithTag(4, value.sprites) - + AudioEntity.ADAPTER.asRepeated().encodedSizeWithTag(5, value.audios) - + value.unknownFields().size(); - } - - @Override - public void encode(ProtoWriter writer, MovieEntity value) throws IOException { - if (value.version != null) ProtoAdapter.STRING.encodeWithTag(writer, 1, value.version); - if (value.params != null) MovieParams.ADAPTER.encodeWithTag(writer, 2, value.params); - images.encodeWithTag(writer, 3, value.images); - SpriteEntity.ADAPTER.asRepeated().encodeWithTag(writer, 4, value.sprites); - AudioEntity.ADAPTER.asRepeated().encodeWithTag(writer, 5, value.audios); - writer.writeBytes(value.unknownFields()); - } - - @Override - public MovieEntity decode(ProtoReader reader) throws IOException { - Builder builder = new Builder(); - long token = reader.beginMessage(); - for (int tag; (tag = reader.nextTag()) != -1;) { - switch (tag) { - case 1: builder.version(ProtoAdapter.STRING.decode(reader)); break; - case 2: builder.params(MovieParams.ADAPTER.decode(reader)); break; - case 3: builder.images.putAll(images.decode(reader)); break; - case 4: builder.sprites.add(SpriteEntity.ADAPTER.decode(reader)); break; - case 5: builder.audios.add(AudioEntity.ADAPTER.decode(reader)); break; - default: { - FieldEncoding fieldEncoding = reader.peekFieldEncoding(); - Object value = fieldEncoding.rawProtoAdapter().decode(reader); - builder.addUnknownField(tag, fieldEncoding, value); - } - } - } - reader.endMessage(token); - return builder.build(); - } - - @Override - public MovieEntity redact(MovieEntity value) { - Builder builder = value.newBuilder(); - if (builder.params != null) builder.params = MovieParams.ADAPTER.redact(builder.params); - Internal.redactElements(builder.sprites, SpriteEntity.ADAPTER); - Internal.redactElements(builder.audios, AudioEntity.ADAPTER); - builder.clearUnknownFields(); - return builder.build(); - } - } } diff --git a/library/src/main/java/com/opensource/svgaplayer/proto/MovieParams.java b/library/src/main/java/com/opensource/svgaplayer/proto/MovieParams.java index e8a3a98b..887d30d1 100644 --- a/library/src/main/java/com/opensource/svgaplayer/proto/MovieParams.java +++ b/library/src/main/java/com/opensource/svgaplayer/proto/MovieParams.java @@ -1,25 +1,24 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: svga.proto at 6:1 +// Source file: wire.proto package com.opensource.svgaplayer.proto; -import com.squareup.wire.FieldEncoding; +import android.os.Parcelable; +import com.squareup.wire.AndroidMessage; import com.squareup.wire.Message; import com.squareup.wire.ProtoAdapter; -import com.squareup.wire.ProtoReader; -import com.squareup.wire.ProtoWriter; +import com.squareup.wire.ProtoAdapterJvm; import com.squareup.wire.WireField; import com.squareup.wire.internal.Internal; -import java.io.IOException; import java.lang.Float; import java.lang.Integer; import java.lang.Object; import java.lang.Override; -import java.lang.String; -import java.lang.StringBuilder; import okio.ByteString; -public final class MovieParams extends Message { - public static final ProtoAdapter ADAPTER = new ProtoAdapter_MovieParams(); +public final class MovieParams extends AndroidMessage { + public static final ProtoAdapter ADAPTER = ProtoAdapterJvm.newMessageAdapter(MovieParams.class); + + public static final Creator CREATOR = AndroidMessage.newCreator(ADAPTER); private static final long serialVersionUID = 0L; @@ -71,7 +70,8 @@ public MovieParams(Float viewBoxWidth, Float viewBoxHeight, Integer fps, Integer this(viewBoxWidth, viewBoxHeight, fps, frames, ByteString.EMPTY); } - public MovieParams(Float viewBoxWidth, Float viewBoxHeight, Integer fps, Integer frames, ByteString unknownFields) { + public MovieParams(Float viewBoxWidth, Float viewBoxHeight, Integer fps, Integer frames, + ByteString unknownFields) { super(ADAPTER, unknownFields); this.viewBoxWidth = viewBoxWidth; this.viewBoxHeight = viewBoxHeight; @@ -116,16 +116,6 @@ public int hashCode() { return result; } - @Override - public String toString() { - StringBuilder builder = new StringBuilder(); - if (viewBoxWidth != null) builder.append(", viewBoxWidth=").append(viewBoxWidth); - if (viewBoxHeight != null) builder.append(", viewBoxHeight=").append(viewBoxHeight); - if (fps != null) builder.append(", fps=").append(fps); - if (frames != null) builder.append(", frames=").append(frames); - return builder.replace(0, 2, "MovieParams{").append('}').toString(); - } - public static final class Builder extends Message.Builder { public Float viewBoxWidth; @@ -175,56 +165,4 @@ public MovieParams build() { return new MovieParams(viewBoxWidth, viewBoxHeight, fps, frames, super.buildUnknownFields()); } } - - private static final class ProtoAdapter_MovieParams extends ProtoAdapter { - ProtoAdapter_MovieParams() { - super(FieldEncoding.LENGTH_DELIMITED, MovieParams.class); - } - - @Override - public int encodedSize(MovieParams value) { - return (value.viewBoxWidth != null ? ProtoAdapter.FLOAT.encodedSizeWithTag(1, value.viewBoxWidth) : 0) - + (value.viewBoxHeight != null ? ProtoAdapter.FLOAT.encodedSizeWithTag(2, value.viewBoxHeight) : 0) - + (value.fps != null ? ProtoAdapter.INT32.encodedSizeWithTag(3, value.fps) : 0) - + (value.frames != null ? ProtoAdapter.INT32.encodedSizeWithTag(4, value.frames) : 0) - + value.unknownFields().size(); - } - - @Override - public void encode(ProtoWriter writer, MovieParams value) throws IOException { - if (value.viewBoxWidth != null) ProtoAdapter.FLOAT.encodeWithTag(writer, 1, value.viewBoxWidth); - if (value.viewBoxHeight != null) ProtoAdapter.FLOAT.encodeWithTag(writer, 2, value.viewBoxHeight); - if (value.fps != null) ProtoAdapter.INT32.encodeWithTag(writer, 3, value.fps); - if (value.frames != null) ProtoAdapter.INT32.encodeWithTag(writer, 4, value.frames); - writer.writeBytes(value.unknownFields()); - } - - @Override - public MovieParams decode(ProtoReader reader) throws IOException { - Builder builder = new Builder(); - long token = reader.beginMessage(); - for (int tag; (tag = reader.nextTag()) != -1;) { - switch (tag) { - case 1: builder.viewBoxWidth(ProtoAdapter.FLOAT.decode(reader)); break; - case 2: builder.viewBoxHeight(ProtoAdapter.FLOAT.decode(reader)); break; - case 3: builder.fps(ProtoAdapter.INT32.decode(reader)); break; - case 4: builder.frames(ProtoAdapter.INT32.decode(reader)); break; - default: { - FieldEncoding fieldEncoding = reader.peekFieldEncoding(); - Object value = fieldEncoding.rawProtoAdapter().decode(reader); - builder.addUnknownField(tag, fieldEncoding, value); - } - } - } - reader.endMessage(token); - return builder.build(); - } - - @Override - public MovieParams redact(MovieParams value) { - Builder builder = value.newBuilder(); - builder.clearUnknownFields(); - return builder.build(); - } - } } diff --git a/library/src/main/java/com/opensource/svgaplayer/proto/ShapeEntity.java b/library/src/main/java/com/opensource/svgaplayer/proto/ShapeEntity.java index 024faace..cf6a8f4b 100644 --- a/library/src/main/java/com/opensource/svgaplayer/proto/ShapeEntity.java +++ b/library/src/main/java/com/opensource/svgaplayer/proto/ShapeEntity.java @@ -1,25 +1,25 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: svga.proto at 43:1 +// Source file: wire.proto package com.opensource.svgaplayer.proto; -import com.squareup.wire.FieldEncoding; +import android.os.Parcelable; +import com.squareup.wire.AndroidMessage; import com.squareup.wire.Message; import com.squareup.wire.ProtoAdapter; -import com.squareup.wire.ProtoReader; -import com.squareup.wire.ProtoWriter; +import com.squareup.wire.ProtoAdapterJvm; import com.squareup.wire.WireEnum; import com.squareup.wire.WireField; import com.squareup.wire.internal.Internal; -import java.io.IOException; import java.lang.Float; import java.lang.Object; import java.lang.Override; import java.lang.String; -import java.lang.StringBuilder; import okio.ByteString; -public final class ShapeEntity extends Message { - public static final ProtoAdapter ADAPTER = new ProtoAdapter_ShapeEntity(); +public final class ShapeEntity extends AndroidMessage { + public static final ProtoAdapter ADAPTER = ProtoAdapterJvm.newMessageAdapter(ShapeEntity.class); + + public static final Creator CREATOR = AndroidMessage.newCreator(ADAPTER); private static final long serialVersionUID = 0L; @@ -71,11 +71,13 @@ public final class ShapeEntity extends Message ) public final EllipseArgs ellipse; - public ShapeEntity(ShapeType type, ShapeStyle styles, Transform transform, ShapeArgs shape, RectArgs rect, EllipseArgs ellipse) { + public ShapeEntity(ShapeType type, ShapeStyle styles, Transform transform, ShapeArgs shape, + RectArgs rect, EllipseArgs ellipse) { this(type, styles, transform, shape, rect, ellipse, ByteString.EMPTY); } - public ShapeEntity(ShapeType type, ShapeStyle styles, Transform transform, ShapeArgs shape, RectArgs rect, EllipseArgs ellipse, ByteString unknownFields) { + public ShapeEntity(ShapeType type, ShapeStyle styles, Transform transform, ShapeArgs shape, + RectArgs rect, EllipseArgs ellipse, ByteString unknownFields) { super(ADAPTER, unknownFields); if (Internal.countNonNull(shape, rect, ellipse) > 1) { throw new IllegalArgumentException("at most one of shape, rect, ellipse may be non-null"); @@ -131,18 +133,6 @@ public int hashCode() { return result; } - @Override - public String toString() { - StringBuilder builder = new StringBuilder(); - if (type != null) builder.append(", type=").append(type); - if (styles != null) builder.append(", styles=").append(styles); - if (transform != null) builder.append(", transform=").append(transform); - if (shape != null) builder.append(", shape=").append(shape); - if (rect != null) builder.append(", rect=").append(rect); - if (ellipse != null) builder.append(", ellipse=").append(ellipse); - return builder.replace(0, 2, "ShapeEntity{").append('}').toString(); - } - public static final class Builder extends Message.Builder { public ShapeType type; @@ -232,7 +222,7 @@ public enum ShapeType implements WireEnum { */ KEEP(3); - public static final ProtoAdapter ADAPTER = ProtoAdapter.newEnumAdapter(ShapeType.class); + public static final ProtoAdapter ADAPTER = ProtoAdapterJvm.newEnumAdapter(ShapeType.class); private final int value; @@ -259,8 +249,10 @@ public int getValue() { } } - public static final class ShapeArgs extends Message { - public static final ProtoAdapter ADAPTER = new ProtoAdapter_ShapeArgs(); + public static final class ShapeArgs extends AndroidMessage { + public static final ProtoAdapter ADAPTER = ProtoAdapterJvm.newMessageAdapter(ShapeArgs.class); + + public static final Creator CREATOR = AndroidMessage.newCreator(ADAPTER); private static final long serialVersionUID = 0L; @@ -312,13 +304,6 @@ public int hashCode() { return result; } - @Override - public String toString() { - StringBuilder builder = new StringBuilder(); - if (d != null) builder.append(", d=").append(d); - return builder.replace(0, 2, "ShapeArgs{").append('}').toString(); - } - public static final class Builder extends Message.Builder { public String d; @@ -338,53 +323,12 @@ public ShapeArgs build() { return new ShapeArgs(d, super.buildUnknownFields()); } } - - private static final class ProtoAdapter_ShapeArgs extends ProtoAdapter { - ProtoAdapter_ShapeArgs() { - super(FieldEncoding.LENGTH_DELIMITED, ShapeArgs.class); - } - - @Override - public int encodedSize(ShapeArgs value) { - return (value.d != null ? ProtoAdapter.STRING.encodedSizeWithTag(1, value.d) : 0) - + value.unknownFields().size(); - } - - @Override - public void encode(ProtoWriter writer, ShapeArgs value) throws IOException { - if (value.d != null) ProtoAdapter.STRING.encodeWithTag(writer, 1, value.d); - writer.writeBytes(value.unknownFields()); - } - - @Override - public ShapeArgs decode(ProtoReader reader) throws IOException { - Builder builder = new Builder(); - long token = reader.beginMessage(); - for (int tag; (tag = reader.nextTag()) != -1;) { - switch (tag) { - case 1: builder.d(ProtoAdapter.STRING.decode(reader)); break; - default: { - FieldEncoding fieldEncoding = reader.peekFieldEncoding(); - Object value = fieldEncoding.rawProtoAdapter().decode(reader); - builder.addUnknownField(tag, fieldEncoding, value); - } - } - } - reader.endMessage(token); - return builder.build(); - } - - @Override - public ShapeArgs redact(ShapeArgs value) { - Builder builder = value.newBuilder(); - builder.clearUnknownFields(); - return builder.build(); - } - } } - public static final class RectArgs extends Message { - public static final ProtoAdapter ADAPTER = new ProtoAdapter_RectArgs(); + public static final class RectArgs extends AndroidMessage { + public static final ProtoAdapter ADAPTER = ProtoAdapterJvm.newMessageAdapter(RectArgs.class); + + public static final Creator CREATOR = AndroidMessage.newCreator(ADAPTER); private static final long serialVersionUID = 0L; @@ -435,7 +379,8 @@ public RectArgs(Float x, Float y, Float width, Float height, Float cornerRadius) this(x, y, width, height, cornerRadius, ByteString.EMPTY); } - public RectArgs(Float x, Float y, Float width, Float height, Float cornerRadius, ByteString unknownFields) { + public RectArgs(Float x, Float y, Float width, Float height, Float cornerRadius, + ByteString unknownFields) { super(ADAPTER, unknownFields); this.x = x; this.y = y; @@ -484,17 +429,6 @@ public int hashCode() { return result; } - @Override - public String toString() { - StringBuilder builder = new StringBuilder(); - if (x != null) builder.append(", x=").append(x); - if (y != null) builder.append(", y=").append(y); - if (width != null) builder.append(", width=").append(width); - if (height != null) builder.append(", height=").append(height); - if (cornerRadius != null) builder.append(", cornerRadius=").append(cornerRadius); - return builder.replace(0, 2, "RectArgs{").append('}').toString(); - } - public static final class Builder extends Message.Builder { public Float x; @@ -542,65 +476,12 @@ public RectArgs build() { return new RectArgs(x, y, width, height, cornerRadius, super.buildUnknownFields()); } } - - private static final class ProtoAdapter_RectArgs extends ProtoAdapter { - ProtoAdapter_RectArgs() { - super(FieldEncoding.LENGTH_DELIMITED, RectArgs.class); - } - - @Override - public int encodedSize(RectArgs value) { - return (value.x != null ? ProtoAdapter.FLOAT.encodedSizeWithTag(1, value.x) : 0) - + (value.y != null ? ProtoAdapter.FLOAT.encodedSizeWithTag(2, value.y) : 0) - + (value.width != null ? ProtoAdapter.FLOAT.encodedSizeWithTag(3, value.width) : 0) - + (value.height != null ? ProtoAdapter.FLOAT.encodedSizeWithTag(4, value.height) : 0) - + (value.cornerRadius != null ? ProtoAdapter.FLOAT.encodedSizeWithTag(5, value.cornerRadius) : 0) - + value.unknownFields().size(); - } - - @Override - public void encode(ProtoWriter writer, RectArgs value) throws IOException { - if (value.x != null) ProtoAdapter.FLOAT.encodeWithTag(writer, 1, value.x); - if (value.y != null) ProtoAdapter.FLOAT.encodeWithTag(writer, 2, value.y); - if (value.width != null) ProtoAdapter.FLOAT.encodeWithTag(writer, 3, value.width); - if (value.height != null) ProtoAdapter.FLOAT.encodeWithTag(writer, 4, value.height); - if (value.cornerRadius != null) ProtoAdapter.FLOAT.encodeWithTag(writer, 5, value.cornerRadius); - writer.writeBytes(value.unknownFields()); - } - - @Override - public RectArgs decode(ProtoReader reader) throws IOException { - Builder builder = new Builder(); - long token = reader.beginMessage(); - for (int tag; (tag = reader.nextTag()) != -1;) { - switch (tag) { - case 1: builder.x(ProtoAdapter.FLOAT.decode(reader)); break; - case 2: builder.y(ProtoAdapter.FLOAT.decode(reader)); break; - case 3: builder.width(ProtoAdapter.FLOAT.decode(reader)); break; - case 4: builder.height(ProtoAdapter.FLOAT.decode(reader)); break; - case 5: builder.cornerRadius(ProtoAdapter.FLOAT.decode(reader)); break; - default: { - FieldEncoding fieldEncoding = reader.peekFieldEncoding(); - Object value = fieldEncoding.rawProtoAdapter().decode(reader); - builder.addUnknownField(tag, fieldEncoding, value); - } - } - } - reader.endMessage(token); - return builder.build(); - } - - @Override - public RectArgs redact(RectArgs value) { - Builder builder = value.newBuilder(); - builder.clearUnknownFields(); - return builder.build(); - } - } } - public static final class EllipseArgs extends Message { - public static final ProtoAdapter ADAPTER = new ProtoAdapter_EllipseArgs(); + public static final class EllipseArgs extends AndroidMessage { + public static final ProtoAdapter ADAPTER = ProtoAdapterJvm.newMessageAdapter(EllipseArgs.class); + + public static final Creator CREATOR = AndroidMessage.newCreator(ADAPTER); private static final long serialVersionUID = 0L; @@ -697,16 +578,6 @@ public int hashCode() { return result; } - @Override - public String toString() { - StringBuilder builder = new StringBuilder(); - if (x != null) builder.append(", x=").append(x); - if (y != null) builder.append(", y=").append(y); - if (radiusX != null) builder.append(", radiusX=").append(radiusX); - if (radiusY != null) builder.append(", radiusY=").append(radiusY); - return builder.replace(0, 2, "EllipseArgs{").append('}').toString(); - } - public static final class Builder extends Message.Builder { public Float x; @@ -756,62 +627,12 @@ public EllipseArgs build() { return new EllipseArgs(x, y, radiusX, radiusY, super.buildUnknownFields()); } } - - private static final class ProtoAdapter_EllipseArgs extends ProtoAdapter { - ProtoAdapter_EllipseArgs() { - super(FieldEncoding.LENGTH_DELIMITED, EllipseArgs.class); - } - - @Override - public int encodedSize(EllipseArgs value) { - return (value.x != null ? ProtoAdapter.FLOAT.encodedSizeWithTag(1, value.x) : 0) - + (value.y != null ? ProtoAdapter.FLOAT.encodedSizeWithTag(2, value.y) : 0) - + (value.radiusX != null ? ProtoAdapter.FLOAT.encodedSizeWithTag(3, value.radiusX) : 0) - + (value.radiusY != null ? ProtoAdapter.FLOAT.encodedSizeWithTag(4, value.radiusY) : 0) - + value.unknownFields().size(); - } - - @Override - public void encode(ProtoWriter writer, EllipseArgs value) throws IOException { - if (value.x != null) ProtoAdapter.FLOAT.encodeWithTag(writer, 1, value.x); - if (value.y != null) ProtoAdapter.FLOAT.encodeWithTag(writer, 2, value.y); - if (value.radiusX != null) ProtoAdapter.FLOAT.encodeWithTag(writer, 3, value.radiusX); - if (value.radiusY != null) ProtoAdapter.FLOAT.encodeWithTag(writer, 4, value.radiusY); - writer.writeBytes(value.unknownFields()); - } - - @Override - public EllipseArgs decode(ProtoReader reader) throws IOException { - Builder builder = new Builder(); - long token = reader.beginMessage(); - for (int tag; (tag = reader.nextTag()) != -1;) { - switch (tag) { - case 1: builder.x(ProtoAdapter.FLOAT.decode(reader)); break; - case 2: builder.y(ProtoAdapter.FLOAT.decode(reader)); break; - case 3: builder.radiusX(ProtoAdapter.FLOAT.decode(reader)); break; - case 4: builder.radiusY(ProtoAdapter.FLOAT.decode(reader)); break; - default: { - FieldEncoding fieldEncoding = reader.peekFieldEncoding(); - Object value = fieldEncoding.rawProtoAdapter().decode(reader); - builder.addUnknownField(tag, fieldEncoding, value); - } - } - } - reader.endMessage(token); - return builder.build(); - } - - @Override - public EllipseArgs redact(EllipseArgs value) { - Builder builder = value.newBuilder(); - builder.clearUnknownFields(); - return builder.build(); - } - } } - public static final class ShapeStyle extends Message { - public static final ProtoAdapter ADAPTER = new ProtoAdapter_ShapeStyle(); + public static final class ShapeStyle extends AndroidMessage { + public static final ProtoAdapter ADAPTER = ProtoAdapterJvm.newMessageAdapter(ShapeStyle.class); + + public static final Creator CREATOR = AndroidMessage.newCreator(ADAPTER); private static final long serialVersionUID = 0L; @@ -910,11 +731,14 @@ public static final class ShapeStyle extends Message { public RGBAColor fill; @@ -1094,8 +903,10 @@ public ShapeStyle build() { } } - public static final class RGBAColor extends Message { - public static final ProtoAdapter ADAPTER = new ProtoAdapter_RGBAColor(); + public static final class RGBAColor extends AndroidMessage { + public static final ProtoAdapter ADAPTER = ProtoAdapterJvm.newMessageAdapter(RGBAColor.class); + + public static final Creator CREATOR = AndroidMessage.newCreator(ADAPTER); private static final long serialVersionUID = 0L; @@ -1180,16 +991,6 @@ public int hashCode() { return result; } - @Override - public String toString() { - StringBuilder builder = new StringBuilder(); - if (r != null) builder.append(", r=").append(r); - if (g != null) builder.append(", g=").append(g); - if (b != null) builder.append(", b=").append(b); - if (a != null) builder.append(", a=").append(a); - return builder.replace(0, 2, "RGBAColor{").append('}').toString(); - } - public static final class Builder extends Message.Builder { public Float r; @@ -1227,58 +1028,6 @@ public RGBAColor build() { return new RGBAColor(r, g, b, a, super.buildUnknownFields()); } } - - private static final class ProtoAdapter_RGBAColor extends ProtoAdapter { - ProtoAdapter_RGBAColor() { - super(FieldEncoding.LENGTH_DELIMITED, RGBAColor.class); - } - - @Override - public int encodedSize(RGBAColor value) { - return (value.r != null ? ProtoAdapter.FLOAT.encodedSizeWithTag(1, value.r) : 0) - + (value.g != null ? ProtoAdapter.FLOAT.encodedSizeWithTag(2, value.g) : 0) - + (value.b != null ? ProtoAdapter.FLOAT.encodedSizeWithTag(3, value.b) : 0) - + (value.a != null ? ProtoAdapter.FLOAT.encodedSizeWithTag(4, value.a) : 0) - + value.unknownFields().size(); - } - - @Override - public void encode(ProtoWriter writer, RGBAColor value) throws IOException { - if (value.r != null) ProtoAdapter.FLOAT.encodeWithTag(writer, 1, value.r); - if (value.g != null) ProtoAdapter.FLOAT.encodeWithTag(writer, 2, value.g); - if (value.b != null) ProtoAdapter.FLOAT.encodeWithTag(writer, 3, value.b); - if (value.a != null) ProtoAdapter.FLOAT.encodeWithTag(writer, 4, value.a); - writer.writeBytes(value.unknownFields()); - } - - @Override - public RGBAColor decode(ProtoReader reader) throws IOException { - Builder builder = new Builder(); - long token = reader.beginMessage(); - for (int tag; (tag = reader.nextTag()) != -1;) { - switch (tag) { - case 1: builder.r(ProtoAdapter.FLOAT.decode(reader)); break; - case 2: builder.g(ProtoAdapter.FLOAT.decode(reader)); break; - case 3: builder.b(ProtoAdapter.FLOAT.decode(reader)); break; - case 4: builder.a(ProtoAdapter.FLOAT.decode(reader)); break; - default: { - FieldEncoding fieldEncoding = reader.peekFieldEncoding(); - Object value = fieldEncoding.rawProtoAdapter().decode(reader); - builder.addUnknownField(tag, fieldEncoding, value); - } - } - } - reader.endMessage(token); - return builder.build(); - } - - @Override - public RGBAColor redact(RGBAColor value) { - Builder builder = value.newBuilder(); - builder.clearUnknownFields(); - return builder.build(); - } - } } public enum LineCap implements WireEnum { @@ -1288,7 +1037,7 @@ public enum LineCap implements WireEnum { LineCap_SQUARE(2); - public static final ProtoAdapter ADAPTER = ProtoAdapter.newEnumAdapter(LineCap.class); + public static final ProtoAdapter ADAPTER = ProtoAdapterJvm.newEnumAdapter(LineCap.class); private final int value; @@ -1321,7 +1070,7 @@ public enum LineJoin implements WireEnum { LineJoin_BEVEL(2); - public static final ProtoAdapter ADAPTER = ProtoAdapter.newEnumAdapter(LineJoin.class); + public static final ProtoAdapter ADAPTER = ProtoAdapterJvm.newEnumAdapter(LineJoin.class); private final int value; @@ -1346,158 +1095,5 @@ public int getValue() { return value; } } - - private static final class ProtoAdapter_ShapeStyle extends ProtoAdapter { - ProtoAdapter_ShapeStyle() { - super(FieldEncoding.LENGTH_DELIMITED, ShapeStyle.class); - } - - @Override - public int encodedSize(ShapeStyle value) { - return (value.fill != null ? RGBAColor.ADAPTER.encodedSizeWithTag(1, value.fill) : 0) - + (value.stroke != null ? RGBAColor.ADAPTER.encodedSizeWithTag(2, value.stroke) : 0) - + (value.strokeWidth != null ? ProtoAdapter.FLOAT.encodedSizeWithTag(3, value.strokeWidth) : 0) - + (value.lineCap != null ? LineCap.ADAPTER.encodedSizeWithTag(4, value.lineCap) : 0) - + (value.lineJoin != null ? LineJoin.ADAPTER.encodedSizeWithTag(5, value.lineJoin) : 0) - + (value.miterLimit != null ? ProtoAdapter.FLOAT.encodedSizeWithTag(6, value.miterLimit) : 0) - + (value.lineDashI != null ? ProtoAdapter.FLOAT.encodedSizeWithTag(7, value.lineDashI) : 0) - + (value.lineDashII != null ? ProtoAdapter.FLOAT.encodedSizeWithTag(8, value.lineDashII) : 0) - + (value.lineDashIII != null ? ProtoAdapter.FLOAT.encodedSizeWithTag(9, value.lineDashIII) : 0) - + value.unknownFields().size(); - } - - @Override - public void encode(ProtoWriter writer, ShapeStyle value) throws IOException { - if (value.fill != null) RGBAColor.ADAPTER.encodeWithTag(writer, 1, value.fill); - if (value.stroke != null) RGBAColor.ADAPTER.encodeWithTag(writer, 2, value.stroke); - if (value.strokeWidth != null) ProtoAdapter.FLOAT.encodeWithTag(writer, 3, value.strokeWidth); - if (value.lineCap != null) LineCap.ADAPTER.encodeWithTag(writer, 4, value.lineCap); - if (value.lineJoin != null) LineJoin.ADAPTER.encodeWithTag(writer, 5, value.lineJoin); - if (value.miterLimit != null) ProtoAdapter.FLOAT.encodeWithTag(writer, 6, value.miterLimit); - if (value.lineDashI != null) ProtoAdapter.FLOAT.encodeWithTag(writer, 7, value.lineDashI); - if (value.lineDashII != null) ProtoAdapter.FLOAT.encodeWithTag(writer, 8, value.lineDashII); - if (value.lineDashIII != null) ProtoAdapter.FLOAT.encodeWithTag(writer, 9, value.lineDashIII); - writer.writeBytes(value.unknownFields()); - } - - @Override - public ShapeStyle decode(ProtoReader reader) throws IOException { - Builder builder = new Builder(); - long token = reader.beginMessage(); - for (int tag; (tag = reader.nextTag()) != -1;) { - switch (tag) { - case 1: builder.fill(RGBAColor.ADAPTER.decode(reader)); break; - case 2: builder.stroke(RGBAColor.ADAPTER.decode(reader)); break; - case 3: builder.strokeWidth(ProtoAdapter.FLOAT.decode(reader)); break; - case 4: { - try { - builder.lineCap(LineCap.ADAPTER.decode(reader)); - } catch (ProtoAdapter.EnumConstantNotFoundException e) { - builder.addUnknownField(tag, FieldEncoding.VARINT, (long) e.value); - } - break; - } - case 5: { - try { - builder.lineJoin(LineJoin.ADAPTER.decode(reader)); - } catch (ProtoAdapter.EnumConstantNotFoundException e) { - builder.addUnknownField(tag, FieldEncoding.VARINT, (long) e.value); - } - break; - } - case 6: builder.miterLimit(ProtoAdapter.FLOAT.decode(reader)); break; - case 7: builder.lineDashI(ProtoAdapter.FLOAT.decode(reader)); break; - case 8: builder.lineDashII(ProtoAdapter.FLOAT.decode(reader)); break; - case 9: builder.lineDashIII(ProtoAdapter.FLOAT.decode(reader)); break; - default: { - FieldEncoding fieldEncoding = reader.peekFieldEncoding(); - Object value = fieldEncoding.rawProtoAdapter().decode(reader); - builder.addUnknownField(tag, fieldEncoding, value); - } - } - } - reader.endMessage(token); - return builder.build(); - } - - @Override - public ShapeStyle redact(ShapeStyle value) { - Builder builder = value.newBuilder(); - if (builder.fill != null) builder.fill = RGBAColor.ADAPTER.redact(builder.fill); - if (builder.stroke != null) builder.stroke = RGBAColor.ADAPTER.redact(builder.stroke); - builder.clearUnknownFields(); - return builder.build(); - } - } - } - - private static final class ProtoAdapter_ShapeEntity extends ProtoAdapter { - ProtoAdapter_ShapeEntity() { - super(FieldEncoding.LENGTH_DELIMITED, ShapeEntity.class); - } - - @Override - public int encodedSize(ShapeEntity value) { - return (value.type != null ? ShapeType.ADAPTER.encodedSizeWithTag(1, value.type) : 0) - + (value.styles != null ? ShapeStyle.ADAPTER.encodedSizeWithTag(10, value.styles) : 0) - + (value.transform != null ? Transform.ADAPTER.encodedSizeWithTag(11, value.transform) : 0) - + (value.shape != null ? ShapeArgs.ADAPTER.encodedSizeWithTag(2, value.shape) : 0) - + (value.rect != null ? RectArgs.ADAPTER.encodedSizeWithTag(3, value.rect) : 0) - + (value.ellipse != null ? EllipseArgs.ADAPTER.encodedSizeWithTag(4, value.ellipse) : 0) - + value.unknownFields().size(); - } - - @Override - public void encode(ProtoWriter writer, ShapeEntity value) throws IOException { - if (value.type != null) ShapeType.ADAPTER.encodeWithTag(writer, 1, value.type); - if (value.styles != null) ShapeStyle.ADAPTER.encodeWithTag(writer, 10, value.styles); - if (value.transform != null) Transform.ADAPTER.encodeWithTag(writer, 11, value.transform); - if (value.shape != null) ShapeArgs.ADAPTER.encodeWithTag(writer, 2, value.shape); - if (value.rect != null) RectArgs.ADAPTER.encodeWithTag(writer, 3, value.rect); - if (value.ellipse != null) EllipseArgs.ADAPTER.encodeWithTag(writer, 4, value.ellipse); - writer.writeBytes(value.unknownFields()); - } - - @Override - public ShapeEntity decode(ProtoReader reader) throws IOException { - Builder builder = new Builder(); - long token = reader.beginMessage(); - for (int tag; (tag = reader.nextTag()) != -1;) { - switch (tag) { - case 1: { - try { - builder.type(ShapeType.ADAPTER.decode(reader)); - } catch (ProtoAdapter.EnumConstantNotFoundException e) { - builder.addUnknownField(tag, FieldEncoding.VARINT, (long) e.value); - } - break; - } - case 10: builder.styles(ShapeStyle.ADAPTER.decode(reader)); break; - case 11: builder.transform(Transform.ADAPTER.decode(reader)); break; - case 2: builder.shape(ShapeArgs.ADAPTER.decode(reader)); break; - case 3: builder.rect(RectArgs.ADAPTER.decode(reader)); break; - case 4: builder.ellipse(EllipseArgs.ADAPTER.decode(reader)); break; - default: { - FieldEncoding fieldEncoding = reader.peekFieldEncoding(); - Object value = fieldEncoding.rawProtoAdapter().decode(reader); - builder.addUnknownField(tag, fieldEncoding, value); - } - } - } - reader.endMessage(token); - return builder.build(); - } - - @Override - public ShapeEntity redact(ShapeEntity value) { - Builder builder = value.newBuilder(); - if (builder.styles != null) builder.styles = ShapeStyle.ADAPTER.redact(builder.styles); - if (builder.transform != null) builder.transform = Transform.ADAPTER.redact(builder.transform); - if (builder.shape != null) builder.shape = ShapeArgs.ADAPTER.redact(builder.shape); - if (builder.rect != null) builder.rect = RectArgs.ADAPTER.redact(builder.rect); - if (builder.ellipse != null) builder.ellipse = EllipseArgs.ADAPTER.redact(builder.ellipse); - builder.clearUnknownFields(); - return builder.build(); - } } } diff --git a/library/src/main/java/com/opensource/svgaplayer/proto/SpriteEntity.java b/library/src/main/java/com/opensource/svgaplayer/proto/SpriteEntity.java index bc9120b5..36e97862 100644 --- a/library/src/main/java/com/opensource/svgaplayer/proto/SpriteEntity.java +++ b/library/src/main/java/com/opensource/svgaplayer/proto/SpriteEntity.java @@ -1,24 +1,24 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: svga.proto at 13:1 +// Source file: wire.proto package com.opensource.svgaplayer.proto; -import com.squareup.wire.FieldEncoding; +import android.os.Parcelable; +import com.squareup.wire.AndroidMessage; import com.squareup.wire.Message; import com.squareup.wire.ProtoAdapter; -import com.squareup.wire.ProtoReader; -import com.squareup.wire.ProtoWriter; +import com.squareup.wire.ProtoAdapterJvm; import com.squareup.wire.WireField; import com.squareup.wire.internal.Internal; -import java.io.IOException; import java.lang.Object; import java.lang.Override; import java.lang.String; -import java.lang.StringBuilder; import java.util.List; import okio.ByteString; -public final class SpriteEntity extends Message { - public static final ProtoAdapter ADAPTER = new ProtoAdapter_SpriteEntity(); +public final class SpriteEntity extends AndroidMessage { + public static final ProtoAdapter ADAPTER = ProtoAdapterJvm.newMessageAdapter(SpriteEntity.class); + + public static final Creator CREATOR = AndroidMessage.newCreator(ADAPTER); private static final long serialVersionUID = 0L; @@ -58,7 +58,8 @@ public SpriteEntity(String imageKey, List frames, String matteKey) this(imageKey, frames, matteKey, ByteString.EMPTY); } - public SpriteEntity(String imageKey, List frames, String matteKey, ByteString unknownFields) { + public SpriteEntity(String imageKey, List frames, String matteKey, + ByteString unknownFields) { super(ADAPTER, unknownFields); this.imageKey = imageKey; this.frames = Internal.immutableCopyOf("frames", frames); @@ -99,15 +100,6 @@ public int hashCode() { return result; } - @Override - public String toString() { - StringBuilder builder = new StringBuilder(); - if (imageKey != null) builder.append(", imageKey=").append(imageKey); - if (!frames.isEmpty()) builder.append(", frames=").append(frames); - if (matteKey != null) builder.append(", matteKey=").append(matteKey); - return builder.replace(0, 2, "SpriteEntity{").append('}').toString(); - } - public static final class Builder extends Message.Builder { public String imageKey; @@ -149,54 +141,4 @@ public SpriteEntity build() { return new SpriteEntity(imageKey, frames, matteKey, super.buildUnknownFields()); } } - - private static final class ProtoAdapter_SpriteEntity extends ProtoAdapter { - ProtoAdapter_SpriteEntity() { - super(FieldEncoding.LENGTH_DELIMITED, SpriteEntity.class); - } - - @Override - public int encodedSize(SpriteEntity value) { - return (value.imageKey != null ? ProtoAdapter.STRING.encodedSizeWithTag(1, value.imageKey) : 0) - + FrameEntity.ADAPTER.asRepeated().encodedSizeWithTag(2, value.frames) - + (value.matteKey != null ? ProtoAdapter.STRING.encodedSizeWithTag(3, value.matteKey) : 0) - + value.unknownFields().size(); - } - - @Override - public void encode(ProtoWriter writer, SpriteEntity value) throws IOException { - if (value.imageKey != null) ProtoAdapter.STRING.encodeWithTag(writer, 1, value.imageKey); - FrameEntity.ADAPTER.asRepeated().encodeWithTag(writer, 2, value.frames); - if (value.matteKey != null) ProtoAdapter.STRING.encodeWithTag(writer, 3, value.matteKey); - writer.writeBytes(value.unknownFields()); - } - - @Override - public SpriteEntity decode(ProtoReader reader) throws IOException { - Builder builder = new Builder(); - long token = reader.beginMessage(); - for (int tag; (tag = reader.nextTag()) != -1;) { - switch (tag) { - case 1: builder.imageKey(ProtoAdapter.STRING.decode(reader)); break; - case 2: builder.frames.add(FrameEntity.ADAPTER.decode(reader)); break; - case 3: builder.matteKey(ProtoAdapter.STRING.decode(reader)); break; - default: { - FieldEncoding fieldEncoding = reader.peekFieldEncoding(); - Object value = fieldEncoding.rawProtoAdapter().decode(reader); - builder.addUnknownField(tag, fieldEncoding, value); - } - } - } - reader.endMessage(token); - return builder.build(); - } - - @Override - public SpriteEntity redact(SpriteEntity value) { - Builder builder = value.newBuilder(); - Internal.redactElements(builder.frames, FrameEntity.ADAPTER); - builder.clearUnknownFields(); - return builder.build(); - } - } } diff --git a/library/src/main/java/com/opensource/svgaplayer/proto/Transform.java b/library/src/main/java/com/opensource/svgaplayer/proto/Transform.java index c4c4941d..e7c20ad2 100644 --- a/library/src/main/java/com/opensource/svgaplayer/proto/Transform.java +++ b/library/src/main/java/com/opensource/svgaplayer/proto/Transform.java @@ -1,24 +1,23 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: svga.proto at 34:1 +// Source file: wire.proto package com.opensource.svgaplayer.proto; -import com.squareup.wire.FieldEncoding; +import android.os.Parcelable; +import com.squareup.wire.AndroidMessage; import com.squareup.wire.Message; import com.squareup.wire.ProtoAdapter; -import com.squareup.wire.ProtoReader; -import com.squareup.wire.ProtoWriter; +import com.squareup.wire.ProtoAdapterJvm; import com.squareup.wire.WireField; import com.squareup.wire.internal.Internal; -import java.io.IOException; import java.lang.Float; import java.lang.Object; import java.lang.Override; -import java.lang.String; -import java.lang.StringBuilder; import okio.ByteString; -public final class Transform extends Message { - public static final ProtoAdapter ADAPTER = new ProtoAdapter_Transform(); +public final class Transform extends AndroidMessage { + public static final ProtoAdapter ADAPTER = ProtoAdapterJvm.newMessageAdapter(Transform.class); + + public static final Creator CREATOR = AndroidMessage.newCreator(ADAPTER); private static final long serialVersionUID = 0L; @@ -74,7 +73,8 @@ public Transform(Float a, Float b, Float c, Float d, Float tx, Float ty) { this(a, b, c, d, tx, ty, ByteString.EMPTY); } - public Transform(Float a, Float b, Float c, Float d, Float tx, Float ty, ByteString unknownFields) { + public Transform(Float a, Float b, Float c, Float d, Float tx, Float ty, + ByteString unknownFields) { super(ADAPTER, unknownFields); this.a = a; this.b = b; @@ -127,18 +127,6 @@ public int hashCode() { return result; } - @Override - public String toString() { - StringBuilder builder = new StringBuilder(); - if (a != null) builder.append(", a=").append(a); - if (b != null) builder.append(", b=").append(b); - if (c != null) builder.append(", c=").append(c); - if (d != null) builder.append(", d=").append(d); - if (tx != null) builder.append(", tx=").append(tx); - if (ty != null) builder.append(", ty=").append(ty); - return builder.replace(0, 2, "Transform{").append('}').toString(); - } - public static final class Builder extends Message.Builder { public Float a; @@ -190,62 +178,4 @@ public Transform build() { return new Transform(a, b, c, d, tx, ty, super.buildUnknownFields()); } } - - private static final class ProtoAdapter_Transform extends ProtoAdapter { - ProtoAdapter_Transform() { - super(FieldEncoding.LENGTH_DELIMITED, Transform.class); - } - - @Override - public int encodedSize(Transform value) { - return (value.a != null ? ProtoAdapter.FLOAT.encodedSizeWithTag(1, value.a) : 0) - + (value.b != null ? ProtoAdapter.FLOAT.encodedSizeWithTag(2, value.b) : 0) - + (value.c != null ? ProtoAdapter.FLOAT.encodedSizeWithTag(3, value.c) : 0) - + (value.d != null ? ProtoAdapter.FLOAT.encodedSizeWithTag(4, value.d) : 0) - + (value.tx != null ? ProtoAdapter.FLOAT.encodedSizeWithTag(5, value.tx) : 0) - + (value.ty != null ? ProtoAdapter.FLOAT.encodedSizeWithTag(6, value.ty) : 0) - + value.unknownFields().size(); - } - - @Override - public void encode(ProtoWriter writer, Transform value) throws IOException { - if (value.a != null) ProtoAdapter.FLOAT.encodeWithTag(writer, 1, value.a); - if (value.b != null) ProtoAdapter.FLOAT.encodeWithTag(writer, 2, value.b); - if (value.c != null) ProtoAdapter.FLOAT.encodeWithTag(writer, 3, value.c); - if (value.d != null) ProtoAdapter.FLOAT.encodeWithTag(writer, 4, value.d); - if (value.tx != null) ProtoAdapter.FLOAT.encodeWithTag(writer, 5, value.tx); - if (value.ty != null) ProtoAdapter.FLOAT.encodeWithTag(writer, 6, value.ty); - writer.writeBytes(value.unknownFields()); - } - - @Override - public Transform decode(ProtoReader reader) throws IOException { - Builder builder = new Builder(); - long token = reader.beginMessage(); - for (int tag; (tag = reader.nextTag()) != -1;) { - switch (tag) { - case 1: builder.a(ProtoAdapter.FLOAT.decode(reader)); break; - case 2: builder.b(ProtoAdapter.FLOAT.decode(reader)); break; - case 3: builder.c(ProtoAdapter.FLOAT.decode(reader)); break; - case 4: builder.d(ProtoAdapter.FLOAT.decode(reader)); break; - case 5: builder.tx(ProtoAdapter.FLOAT.decode(reader)); break; - case 6: builder.ty(ProtoAdapter.FLOAT.decode(reader)); break; - default: { - FieldEncoding fieldEncoding = reader.peekFieldEncoding(); - Object value = fieldEncoding.rawProtoAdapter().decode(reader); - builder.addUnknownField(tag, fieldEncoding, value); - } - } - } - reader.endMessage(token); - return builder.build(); - } - - @Override - public Transform redact(Transform value) { - Builder builder = value.newBuilder(); - builder.clearUnknownFields(); - return builder.build(); - } - } }