Skip to content

Commit 5b4b73c

Browse files
steelrooterfacebook-github-bot
authored andcommitted
Convert fbandroid/libraries/fresco/drawee/src/m/j/c/f/drawee/drawable/DrawableParent to Kotlin
Reviewed By: kartavya-ramnani Differential Revision: D62498402 fbshipit-source-id: 2e58ff29953cf52abda9e3182adc3e585963e905
1 parent 9589fa4 commit 5b4b73c

2 files changed

Lines changed: 8 additions & 14 deletions

File tree

‎drawee/src/main/java/com/facebook/drawee/drawable/ArrayDrawable.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -303,16 +303,15 @@ public DrawableParent getDrawableParentForIndex(int index) {
303303

304304
private DrawableParent createDrawableParentForIndex(final int index) {
305305
return new DrawableParent() {
306+
@Nullable
306307
@Override
307-
// NULLSAFE_FIXME[Inconsistent Subclass Parameter Annotation]
308-
public Drawable setDrawable(Drawable newDrawable) {
309-
// NULLSAFE_FIXME[Return Not Nullable]
308+
public Drawable setDrawable(@Nullable Drawable newDrawable) {
310309
return ArrayDrawable.this.setDrawable(index, newDrawable);
311310
}
312311

312+
@Nullable
313313
@Override
314314
public Drawable getDrawable() {
315-
// NULLSAFE_FIXME[Return Not Nullable]
316315
return ArrayDrawable.this.getDrawable(index);
317316
}
318317
};

drawee/src/main/java/com/facebook/drawee/drawable/DrawableParent.java renamed to drawee/src/main/java/com/facebook/drawee/drawable/DrawableParent.kt

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,25 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
package com.facebook.drawee.drawable;
8+
package com.facebook.drawee.drawable
99

10-
import android.graphics.drawable.Drawable;
11-
import com.facebook.infer.annotation.Nullsafe;
12-
import javax.annotation.Nullable;
10+
import android.graphics.drawable.Drawable
1311

1412
/** A drawable parent that has a single child. */
15-
@Nullsafe(Nullsafe.Mode.LOCAL)
16-
public interface DrawableParent {
13+
interface DrawableParent {
1714

1815
/**
1916
* Sets the new child drawable.
2017
*
2118
* @param newDrawable a new child drawable to set
2219
* @return the old child drawable
2320
*/
24-
@Nullable
25-
Drawable setDrawable(@Nullable Drawable newDrawable);
21+
fun setDrawable(newDrawable: Drawable?): Drawable?
2622

2723
/**
2824
* Gets the child drawable.
2925
*
3026
* @return the current child drawable
3127
*/
32-
@Nullable
33-
Drawable getDrawable();
28+
val drawable: Drawable?
3429
}

0 commit comments

Comments
 (0)