#457: Converted java to Kotlin #835

rahul13agrawal · 2023-10-11T08:47:25Z

Fixes: https://github.com/koral--/android-gif-drawable/issues/457

Updated to java 17

koral-- · 2023-10-11T18:18:33Z

android-gif-drawable/src/main/java/pl/droidsonroids/gif/ConditionVariable.kt

+    }
+}
+
+


Extra newlines to be removed.

koral-- · 2023-10-11T18:19:07Z

android-gif-drawable/src/main/java/pl/droidsonroids/gif/GifAnimationMetaData.kt

+    constructor(filePath: String) : this(GifInfoHandle(filePath))
+
+    /**
+     * Equivalent to `` GifMetadata(file.getPath())}


Suggested change

* Equivalent to `` GifMetadata(file.getPath())}

* Equivalent to `GifMetadata(file.getPath())}`

koral-- · 2023-10-11T21:45:05Z

android-gif-drawable/src/main/java/pl/droidsonroids/gif/GifTexImage2D.kt

+ * Current frame can be copied to 2D texture when needed. See [.glTexImage2D] and [.glTexSubImage2D].
+ */
+class GifTexImage2D(inputSource: InputSource, options: GifOptions?) {
+    private val mGifInfoHandle: GifInfoHandle?


this should not be nullable

koral-- · 2023-10-11T21:45:35Z

android-gif-drawable/src/main/java/pl/droidsonroids/gif/GifTexImage2D.kt

+         */
+        get() = mGifInfoHandle!!.duration
+
+    @Throws(Throwable::class)


this annotation is useless, please remove

koral-- · 2023-10-11T21:46:21Z

android-gif-drawable/src/main/java/pl/droidsonroids/gif/GifTextView.kt

+            try {
+                return GifDrawable(resources, resId)
+            } catch (ignored: IOException) {
+                // ignored


this comment is not needed

koral-- · 2023-10-11T22:45:16Z

android-gif-drawable/src/test/java/pl/droidsonroids/gif/ConditionVariableTest.kt

+    private var conditionVariable: ConditionVariable? = null
+    private var waiter: Waiter? = null


Can be lateinit instead of nullable

android-gif-drawable/src/main/java/pl/droidsonroids/gif/GifTexImage2D.kt

koral-- · 2023-10-11T22:47:29Z

android-gif-drawable/src/main/java/pl/droidsonroids/gif/GifInfoHandle.kt

+    val isRecycled: Boolean
+        get() = gifInfoPtr == 0L
+
+    @Throws(Throwable::class)


to be removed

android-gif-drawable/src/main/java/pl/droidsonroids/gif/GifDrawable.kt

android-gif-drawable/src/main/c/bitmap.c

koral--

Another set of comments. This is still not the last one.

koral-- · 2023-10-14T15:49:48Z

android-gif-drawable/build.gradle

@@ -9,8 +10,8 @@ android {
    compileSdkVersion versions.compileSdk

    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17


There should be still java 1.8
See https://github.com/koral--/android-gif-drawable/issues/826

The project does not compile for me when I move it back to 1.8

OK, I'll check this further ASAP.

koral-- · 2023-10-14T15:50:20Z

android-gif-drawable/src/androidTest/java/pl/droidsonroids/gif/AllocationByteCountTest.kt

+        val resources = getInstrumentation().context.resources
+        val drawable = GifDrawable(resources, pl.droidsonroids.gif.test.R.raw.test)
+        val metaData = GifAnimationMetaData(resources, pl.droidsonroids.gif.test.R.raw.test)
+        Assertions.assertThat(drawable.frameByteCount + metaData.allocationByteCount)


import Assertions.assertThat
here and in other similar files

koral-- · 2023-10-14T15:55:44Z

android-gif-drawable/src/androidTest/java/pl/droidsonroids/gif/GifViewDescriptorTest.kt

+    @Before
+    fun setUp() {
+        val context = InstrumentationRegistry.getInstrumentation().context
+        rootView = LayoutInflater.from(context).inflate(pl.droidsonroids.gif.test.R.layout.attrributes, null, false)


import pl.droidsonroids.gif.test.R here and in other tests.

koral-- · 2023-10-14T15:57:33Z

android-gif-drawable/src/androidTest/java/pl/droidsonroids/gif/InputStreamTest.kt

+        val responseStream: InputStream = ByteArrayInputStream(buffer)
+        val gifDrawable = GifDrawable(responseStream)
+        Assertions.assertThat(gifDrawable.error).isEqualTo(GifError.NO_ERROR)


Suggested change

val responseStream: InputStream = ByteArrayInputStream(buffer)

val gifDrawable = GifDrawable(responseStream)

Assertions.assertThat(gifDrawable.error).isEqualTo(GifError.NO_ERROR)

val responseStream: InputStream = ByteArrayInputStream(buffer)

val gifDrawable = GifDrawable(responseStream)

Assertions.assertThat(gifDrawable.error).isEqualTo(GifError.NO_ERROR)

Separate arrange, act and assert sections with a newlines. Here and in other tests.

koral-- · 2023-10-14T15:59:04Z

android-gif-drawable/src/main/java/pl/droidsonroids/gif/GifAnimationMetaData.kt

+    /**
+     * See [GifDrawable.getDuration]
+     *
+     * @return duration of of one loop the animation in milliseconds. Result is always multiple of 10.


Suggested change

* @return duration of of one loop the animation in milliseconds. Result is always multiple of 10.

* @return duration of one loop the animation in milliseconds. Result is always multiple of 10.

koral-- · 2023-10-14T17:22:41Z

android-gif-drawable/src/main/java/pl/droidsonroids/gif/InputSource.kt

+    abstract fun open(): GifInfoHandle
+    @Throws(IOException::class)


Suggested change

abstract fun open(): GifInfoHandle

@Throws(IOException::class)

abstract fun open(): GifInfoHandle

@Throws(IOException::class)

koral-- · 2023-10-14T17:35:56Z

android-gif-drawable/src/test/java/pl/droidsonroids/gif/CallbackWeakReferenceTest.kt

+    fun testNotEqualReferences() {
+        val reference = CallbackWeakReference(callback)
+        val anotherReference = CallbackWeakReference(anotherCallback)
+        Java6Assertions.assertThat(reference).isNotEqualTo(anotherReference)


Replace L4 with import org.assertj.core.api.Java6Assertions.assertThat
Remove Java6Assertions. prefixes from the test methods.

koral-- · 2023-10-14T17:37:12Z

android-gif-drawable/src/test/java/pl/droidsonroids/gif/GifViewUtilsDensityTest.kt

+@RunWith(
+    MockitoJUnitRunner::class
+)


Suggested change

@RunWith(

MockitoJUnitRunner::class

)

@RunWith(MockitoJUnitRunner::class)

Change also similar places, if any.

koral-- · 2023-10-14T17:37:47Z

android-gif-drawable/src/test/java/pl/droidsonroids/gif/GifViewUtilsDensityTest.kt

+    lateinit var resources: Resources
+
+    private fun getMockedResources(resourceDensity: Int, displayDensity: Int): Resources {
+        Mockito.doAnswer { invocation ->


import Mockito just like Java6Assertions from one of the previous comments.

koral-- · 2023-10-14T17:40:36Z

android-gif-drawable/src/main/java/pl/droidsonroids/gif/GifDrawable.kt

+    /**
+     * Frame buffer, holds current frame.
+     */
+    var mBuffer: Bitmap


It should be internal. This also applies to most (if not all) other members which were previously package private.
But, it may break the backwards compatibility.
Please hold on any changes in this matter for now. I need to think about that.

android-gif-drawable/src/main/java/pl/droidsonroids/gif/GifIOException.kt

rahul13agrawal · 2023-10-20T03:07:26Z

@koral-- Let me know if more comments on the review. I have resolved the comments couple of days back.

koral-- · 2023-10-20T10:14:51Z

Changes are looking very good. Great work!

I plan to add some binary compatibility checker https://plugins.gradle.org/search?term=binary-compatibility
and depending on the results decide whether it will be version 2.x or we can keep the backwards compatibility and stick to 1.x.
Some minor changes like changing the visibility to internal may be required next.

I'll try to do that in a few days from now.

koral-- · 2023-10-24T13:13:04Z

Hi @rahul13agrawal I've just added https://github.com/Kotlin/binary-compatibility-validator. You can rebase on the latest dev and execute the gradle tasks:

apiCheck- this will give you a diff in terminal
apiDump - this will overwrite the current apiDump file so you can inspect the git diff in your Android Studio or whatever you prefer

It is perfectly OK that some method or class gets added. It will happen for e.g. all companion objects.
But, if signature of the method, class or field has changed it can break the compatibility for existing users.
The diff is quite large now, but here are some easily fixable insights:

classes become final by default in kotlin, so we need to add open modifiers, this also applies to methods
some fields like GifError.description were replaced by methods, you can probably use @JvmField for them
some extra methods are added like GifDrawable.setMIsRunning which should probably not be part of an API

rahul13agrawal · 2023-10-26T08:13:26Z

@koral-- I will go through this by this weekend.

rahul13agrawal · 2023-11-15T06:43:01Z

Hi @koral-- Sorry for such late response. I have rebase with the latest changes but whenever I run ./gradlew apiCheck or apiDump I get build successful. I am unable to find any changes. Neither in Android Studio nor in the terminal.
I have gone through https://github.com/Kotlin/binary-compatibility-validator and tried to check but with no result.

koral-- · 2023-11-15T11:29:22Z

Indeed, it seems that disabling the check in the sample module only causes disabling it entirely. I need to investigate this.

In the meantime you can comment out or delete this line: https://github.com/koral--/android-gif-drawable/blob/dev/sample/build.gradle#L65 and ignore the generate dump of the sample module.

rahul-quicksell added 5 commits October 11, 2023 14:15

Rename .java to .kt

2289519

Converted java to kotlin.

5126d52

Updated to java 17

Rename .java to .kt

9adb008

Converted test cases to Kotlin

3a5dd0d

fixed test case failing

8904edd

koral-- reviewed Oct 11, 2023

View reviewed changes

rahul-quicksell added 2 commits October 12, 2023 13:17

reformatted code

6a2d3bf

Formatted code

d0a775c

koral-- reviewed Oct 14, 2023

View reviewed changes

updated the code as per review comments

1367aa5

koral-- reviewed Oct 15, 2023

View reviewed changes

android-gif-drawable/src/main/java/pl/droidsonroids/gif/GifIOException.kt Outdated Show resolved Hide resolved

rahul-quicksell added 2 commits October 16, 2023 12:11

test fail fix

c0fa2d3

fixed documentation

5299712

Merge branch 'dev' into rahul/converted-to-kotlin

7b7b6c0

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

#457: Converted java to Kotlin #835

#457: Converted java to Kotlin #835

rahul13agrawal commented Oct 11, 2023

koral-- Oct 11, 2023

koral-- Oct 11, 2023

koral-- Oct 11, 2023

koral-- Oct 11, 2023

koral-- Oct 11, 2023

koral-- Oct 11, 2023

koral-- Oct 11, 2023

koral-- left a comment

koral-- Oct 14, 2023

rahul13agrawal Oct 16, 2023

koral-- Oct 17, 2023

koral-- Oct 14, 2023

koral-- Oct 14, 2023

koral-- Oct 14, 2023

koral-- Oct 14, 2023

koral-- Oct 14, 2023

koral-- Oct 14, 2023

koral-- Oct 14, 2023

koral-- Oct 14, 2023

koral-- Oct 14, 2023

rahul13agrawal commented Oct 20, 2023

koral-- commented Oct 20, 2023

koral-- commented Oct 24, 2023 •

edited

rahul13agrawal commented Oct 26, 2023

rahul13agrawal commented Nov 15, 2023

koral-- commented Nov 15, 2023

	* Equivalent to `` GifMetadata(file.getPath())}
	* Equivalent to `GifMetadata(file.getPath())}`

		private var conditionVariable: ConditionVariable? = null
		private var waiter: Waiter? = null

	* @return duration of of one loop the animation in milliseconds. Result is always multiple of 10.
	* @return duration of one loop the animation in milliseconds. Result is always multiple of 10.

		abstract fun open(): GifInfoHandle
		@Throws(IOException::class)

#457: Converted java to Kotlin #835

Are you sure you want to change the base?

#457: Converted java to Kotlin #835

Conversation

rahul13agrawal commented Oct 11, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

koral-- left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rahul13agrawal commented Oct 20, 2023

koral-- commented Oct 20, 2023

koral-- commented Oct 24, 2023 • edited

rahul13agrawal commented Oct 26, 2023

rahul13agrawal commented Nov 15, 2023

koral-- commented Nov 15, 2023

koral-- commented Oct 24, 2023 •

edited