Move getCharSequenceArrayListOrNull back to common

zsmb13 · May 18, 2024 · ebc7b6c · ebc7b6c
1 parent bdffff2
commit ebc7b6c
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 20 deletions.
diff --git a/requirektx-bundle/api/android/requirektx-bundle.api b/requirektx-bundle/api/android/requirektx-bundle.api
@@ -1,4 +1,5 @@
 public final class co/zsmb/requirektx/BundleArrayListKt {
+	public static final fun getCharSequenceArrayListOrNull (Landroid/os/Bundle;Ljava/lang/String;)Ljava/util/ArrayList;
 	public static final fun getIntegerArrayListOrNull (Landroid/os/Bundle;Ljava/lang/String;)Ljava/util/ArrayList;
 	public static final fun getStringArrayListOrNull (Landroid/os/Bundle;Ljava/lang/String;)Ljava/util/ArrayList;
 	public static final fun requireCharSequenceArrayList (Landroid/os/Bundle;Ljava/lang/String;)Ljava/util/ArrayList;
@@ -7,7 +8,6 @@ public final class co/zsmb/requirektx/BundleArrayListKt {
 }
 
 public final class co/zsmb/requirektx/BundleArrayList_androidKt {
-	public static final fun getCharSequenceArrayListOrNull (Landroid/os/Bundle;Ljava/lang/String;)Ljava/util/ArrayList;
 	public static final fun getParcelableArrayListOrNull (Landroid/os/Bundle;Ljava/lang/String;)Ljava/util/ArrayList;
 	public static final fun requireParcelableArrayList (Landroid/os/Bundle;Ljava/lang/String;)Ljava/util/ArrayList;
 }

diff --git a/requirektx-bundle/api/jvm/requirektx-bundle.api b/requirektx-bundle/api/jvm/requirektx-bundle.api
@@ -1,8 +1,5 @@
-public final class BlaKt {
-	public static final fun publicjvmapi ()V
-}
-
 public final class co/zsmb/requirektx/BundleArrayListKt {
+	public static final fun getCharSequenceArrayListOrNull (Landroidx/core/bundle/Bundle;Ljava/lang/String;)Ljava/util/ArrayList;
 	public static final fun getIntegerArrayListOrNull (Landroidx/core/bundle/Bundle;Ljava/lang/String;)Ljava/util/ArrayList;
 	public static final fun getStringArrayListOrNull (Landroidx/core/bundle/Bundle;Ljava/lang/String;)Ljava/util/ArrayList;
 	public static final fun requireCharSequenceArrayList (Landroidx/core/bundle/Bundle;Ljava/lang/String;)Ljava/util/ArrayList;

diff --git a/requirektx-bundle/api/requirektx-bundle.klib.api b/requirektx-bundle/api/requirektx-bundle.klib.api
@@ -13,6 +13,7 @@ final inline fun (androidx.core.bundle/Bundle).co.zsmb.requirektx/getByteArrayOr
 final inline fun (androidx.core.bundle/Bundle).co.zsmb.requirektx/getByteOrNull(kotlin/String): kotlin/Byte? // co.zsmb.requirektx/getByteOrNull|[email protected](kotlin.String){}[0]
 final inline fun (androidx.core.bundle/Bundle).co.zsmb.requirektx/getCharArrayOrNull(kotlin/String): kotlin/CharArray? // co.zsmb.requirektx/getCharArrayOrNull|[email protected](kotlin.String){}[0]
 final inline fun (androidx.core.bundle/Bundle).co.zsmb.requirektx/getCharOrNull(kotlin/String): kotlin/Char? // co.zsmb.requirektx/getCharOrNull|[email protected](kotlin.String){}[0]
+final inline fun (androidx.core.bundle/Bundle).co.zsmb.requirektx/getCharSequenceArrayListOrNull(kotlin/String): kotlin.collections/ArrayList<kotlin/CharSequence>? // co.zsmb.requirektx/getCharSequenceArrayListOrNull|[email protected](kotlin.String){}[0]
 final inline fun (androidx.core.bundle/Bundle).co.zsmb.requirektx/getCharSequenceArrayOrNull(kotlin/String): kotlin/Array<kotlin/CharSequence>? // co.zsmb.requirektx/getCharSequenceArrayOrNull|[email protected](kotlin.String){}[0]
 final inline fun (androidx.core.bundle/Bundle).co.zsmb.requirektx/getCharSequenceOrNull(kotlin/String): kotlin/CharSequence? // co.zsmb.requirektx/getCharSequenceOrNull|[email protected](kotlin.String){}[0]
 final inline fun (androidx.core.bundle/Bundle).co.zsmb.requirektx/getDoubleArrayOrNull(kotlin/String): kotlin/DoubleArray? // co.zsmb.requirektx/getDoubleArrayOrNull|[email protected](kotlin.String){}[0]

diff --git a/requirektx-bundle/src/androidMain/kotlin/co/zsmb/requirektx/BundleArrayList.android.kt b/requirektx-bundle/src/androidMain/kotlin/co/zsmb/requirektx/BundleArrayList.android.kt
@@ -6,21 +6,15 @@ import androidx.core.bundle.Bundle
 import android.os.Parcelable
 
 /**
-    * Returns the value associated with the given key.
-    *
-    * @throws IllegalArgumentException if the key does not exist.
-    * @throws IllegalStateException if the stored value is of the wrong type.
-    */
+ * Returns the value associated with the given key.
+ *
+ * @throws IllegalArgumentException if the key does not exist.
+ * @throws IllegalStateException if the stored value is of the wrong type.
+ */
 public inline fun Bundle.requireParcelableArrayList(key: String): ArrayList<Parcelable> = requireImpl(key)
 
-/**
-    * Returns the value associated with the given key, or null if the key doesn't exist,
-    * or the stored value is of the wrong type.
-    */
-public inline fun Bundle.getParcelableArrayListOrNull(key: String): ArrayList<Parcelable>? = getOrNullImpl(key)
-
 /**
  * Returns the value associated with the given key, or null if the key doesn't exist,
-* or the stored value is of the wrong type.
-*/
-public inline fun Bundle.getCharSequenceArrayListOrNull(key: String): ArrayList<CharSequence>? = getOrNullImpl(key)
+ * or the stored value is of the wrong type.
+ */
+public inline fun Bundle.getParcelableArrayListOrNull(key: String): ArrayList<Parcelable>? = getOrNullImpl(key)
diff --git a/requirektx-bundle/src/commonMain/kotlin/co/zsmb/requirektx/BundleArrayList.kt b/requirektx-bundle/src/commonMain/kotlin/co/zsmb/requirektx/BundleArrayList.kt
@@ -26,7 +26,11 @@ public inline fun Bundle.getIntegerArrayListOrNull(key: String): ArrayList<Int>?
  */
 public inline fun Bundle.requireCharSequenceArrayList(key: String): ArrayList<CharSequence> = requireImpl(key)
 
-
+/**
+ * Returns the value associated with the given key, or null if the key doesn't exist,
+* or the stored value is of the wrong type.
+*/
+public inline fun Bundle.getCharSequenceArrayListOrNull(key: String): ArrayList<CharSequence>? = getOrNullImpl(key)
 
 /**
  * Returns the value associated with the given key.