react-native-icon-switcher 0.1.6 → 0.1.8

package/README.md

@@ -22,7 +22,7 @@ Switch the app icon at runtime on React Native and Expo from one config file, wi
 npx expo install react-native-icon-switcher
 ```
 
-Add the config plugin in `app.json` / `app.config.ts` (icon paths can live here or in `icon-switcher.config.ts` at the project root — see [Config](#config)):
+Add the config plugin in `app.json` / `app.config.ts` and pass the icon config as its options (same shape as [Config](#config)):
 
 ```ts
 export default {
@@ -44,6 +44,20 @@ export default {
 
 Then run `npx expo prebuild` or use a development build. Expo Go is not supported.
 
+The plugin only reads its inline options; it does not look for `icon-switcher.config.ts` on its own. To keep the config in its own file (for example to share it with the `sync` CLI), import it in `app.config.ts` with the explicit extension:
+
+```ts
+import iconSwitcherConfig from './icon-switcher.config.ts';
+
+export default {
+  expo: {
+    plugins: [['react-native-icon-switcher', iconSwitcherConfig]],
+  },
+};
+```
+
+Expo transpiles `app.config.ts` but not the files it imports, so this relies on Node's built-in TypeScript type stripping (Node 22.18 or later). On older Node versions, write the config as `icon-switcher.config.js` instead.
+
 ### Bare React Native
 
 ```sh
@@ -61,13 +75,27 @@ npx react-native-icon-switcher sync
 
 Use `npx react-native-icon-switcher sync --check` in CI to fail when generated native files or `icon-switcher.d.ts` are out of date.
 
+```sh
+react-native-icon-switcher sync [--check] [--project-root <dir>] [--config <path>]
+```
+
+| Flag | Default | Description |
+| --- | --- | --- |
+| `--check` | off | Write nothing; print each out-of-date path and exit `1` if any. |
+| `--project-root <dir>` | current directory | App root containing `ios/` and `android/` (useful in monorepos). |
+| `--config <path>` | first of `icon-switcher.config.{ts,js,mjs,cjs}` in the project root | Config file to load. TypeScript is loaded directly, with no compile step. |
+
+Exit codes: `0` success (or no drift with `--check`), `1` drift found by `--check`, `2` invalid arguments, config errors, or an unexpected project layout. Without `--check` it prints `updated N files, unchanged M`.
+
 **No `expo` package is required** for bare apps: this library is a TurboModule with a standalone `sync` CLI. You only need `expo` if you opt into the Expo config plugin workflow.
 
 See `example/` (Expo) and `example-bare/` (bare CLI + `sync`) in this repo.
 
 ## Config
 
-Bare apps use `icon-switcher.config.ts` at the project root. Expo apps can pass the same shape as plugin options or point the plugin at a config file.
+Bare apps use `icon-switcher.config.ts` at the project root. Expo apps pass the same shape as plugin options (or import that file, see [Expo](#expo)).
+
+`defineIcons` has no runtime effect: it returns its argument unchanged and exists so TypeScript checks the object as you write it (misspelled keys, wrong `applyOn` values, a missing adaptive `background`) and offers autocomplete. Value rules are checked when `sync` or `expo prebuild` runs, and every problem is reported at once.
 
 ```ts
 import { defineIcons } from 'react-native-icon-switcher/config';
@@ -105,12 +133,31 @@ Per-icon `ios` / `android` fields accept a path or structured variants (`IosIcon
 
 Icons with no art for a platform are omitted from that platform's generated outputs.
 
+**Validation:** `sync` and the Expo plugin fail if `icons` is empty, a name does not match `/^[a-z][a-z0-9_]*$/` or uses `default`, a colour is not `#RGB` / `#RRGGBB`, an image file does not exist, or Expo's default icon and `default` point at different files.
+
 **Android reserved names:** names may not be `round`, `foreground`, `background`, or `monochrome`, nor end in `_round`, `_foreground`, `_background`, or `_monochrome`.
 
+**Android adaptive icons:** layers are 108×108 dp, but launchers show only the central 72×72 dp and then mask it (circle, squircle, …). Keep logos and text inside that centre, about the middle two thirds of the image. To fit artwork that fills its square, scale it into the centre of the `background` image on a matching colour and use a transparent `foreground`.
+
 **Legacy Android icons (API 24–25):** besides the adaptive layers and `mipmap-anydpi-v26` XML, `sync` and the plugin write `ic_launcher*.png` the way Android Studio's Image Asset tool does: the visible centre of an adaptive icon (72 dp of the 108 dp layers; a plain path uses the whole image) in a 38 dp rounded square or a 44 dp circle, with a soft drop shadow, on a transparent 48 dp canvas.
 
+**Variants (experimental):** iOS `dark` / `tinted` and Android `monochrome` (themed icons, Android 13+) are generated when set, but have not yet been verified on devices.
+
+### What `sync` and the plugin generate
+
+| | iOS | Android |
+| --- | --- | --- |
+| Images | `AppIcon-<name>.appiconset` in `Images.xcassets` (1024 px, flattened onto `ios.flattenOn`) | `mipmap-*/ic_launcher_<name>*` in five densities, plus `mipmap-anydpi-v26` adaptive XML |
+| Registration | `ASSETCATALOG_COMPILER_ALTERNATE_APPICON_NAMES` and `ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS` build settings | One `activity-alias` per icon, `.IconSwitcher_<name>`; `MainActivity` loses its launcher filter |
+| Runtime list | `IconSwitcherIcons` array in `Info.plist` | `com.iconswitcher.*` meta-data in `AndroidManifest.xml` |
+| Types | `icon-switcher.d.ts` at the project root | same file |
+
+Xcode generates `CFBundleIcons` from the build settings, so the library does not write it. Other content in these files is left as it is: comments, formatting, and the quoting CocoaPods applies to the pbxproj, so `sync --check` stays clean after `pod install`. In bare apps, commit the generated files. With Expo prebuild, commit `icon-switcher.d.ts`; native folders follow your usual prebuild policy.
+
 **Managed iOS icon sets:** when `sync` or the plugin rewrites an `.appiconset` it owns, it deletes files in that folder that the new `Contents.json` does not reference (`sync --check` reports them). Other icon sets are left alone.
 
+**Generated images across machines:** image resampling rounds slightly differently on different CPUs (for example an Apple silicon Mac and x86 Linux CI). `sync` treats an existing PNG whose pixels differ from the regenerated one by at most 3 levels per channel as unchanged, so `sync --check` stays green and files are not rewritten.
+
 ## Usage
 
 ```ts
@@ -133,7 +180,7 @@ if (IconSwitcher.isSupported) {
 
 | Method | Returns | Notes |
 | --- | --- | --- |
-| `IconSwitcher.isSupported` | `boolean` | `false` when the TurboModule is missing (web, Expo Go, unlink) or the device brand is skipped. |
+| `IconSwitcher.isSupported` | `boolean` | `false` when the TurboModule is missing (web, Expo Go, unlink), the device brand is skipped, or iOS reports `supportsAlternateIcons` as `false`. |
 | `IconSwitcher.list()` | `IconName[]` | Bundled icon names; `default` first. |
 | `IconSwitcher.getCurrent()` | `Promise<IconName>` | |
 | `IconSwitcher.set(name)` | `Promise<{ status: 'applied' \| 'pending' }>` | Android with `applyOn: 'background'` → `pending` until background or `applyPending()`. |
@@ -181,7 +228,7 @@ const unsubscribe = await syncIcon({
     const res = await fetch('https://api.example.com/icon');
     return (await res.json()).iconName as string;
   },
-  storage: optionalAsyncKeyValue, // default: in-memory
+  storage: AsyncStorage, // optional; default: in-memory
   retryAfterMs: 24 * 60 * 60 * 1000, // skip re-apply after failure
   onError: (err) => console.warn(err),
 });
@@ -192,6 +239,10 @@ const unsubscribe = await syncIcon({
 
 On **iOS**, the helper runs when the app is `active` and subscribes to `AppState`. On **Android**, it runs once when called (`set` may still return `pending`).
 
+Each run does nothing when `fetchChoice` returns `null`, `undefined`, `''`, or a name not in `list()`, or when the choice is already current. A `pending` result is not recorded as applied.
+
+`storage` is any object with async `getItem(key): Promise<string | null>` and `setItem(key, value): Promise<void>` (`SyncIconStorage`), such as `@react-native-async-storage/async-storage`. The helper uses the keys `icon-switcher:lastApplied` and `icon-switcher:lastFailed`. With the default in-memory storage, the retry block lasts only as long as that `syncIcon` call, so a restart retries straight away.
+
 ## Testing with Jest
 
 Ship a CommonJS mock that never loads native code:
@@ -242,11 +293,12 @@ it('applies a pending switch', async () => {
 
 Deferred apply, task recreation when aliases toggle, the `applyPending()` foreground guard, cold-start behaviour, and launcher shortcuts are documented in [docs/guides/android.md](docs/guides/android.md).
 
-Summary: with default `applyOn: 'background'`, `set()` returns `pending` and the launcher updates after the user leaves the app; the process usually survives but the next open may look like a cold start. `applyPending()` in the foreground is refused with `foreground`.
+Summary: with default `applyOn: 'background'`, `set()` returns `pending` and the launcher updates when the last screen stops (including swipe-away from Recents) or after you background the app; listening starts at process start via AndroidX Startup. The process usually survives but the next open may look like a cold start. `applyPending()` in the foreground is refused with `foreground`.
 
 ## Requirements
 
 - **New Architecture (TurboModule) required** — React Native **≥ 0.82** (developed with **0.88**).
+- **iOS 15.1+** (React Native's `min_ios_version_supported`) and **Android minSdk 24**. On Android the module adds `androidx.lifecycle:lifecycle-process` to detect when the app goes to the background.
 - **Expo SDK ≥ 52** when using the config plugin (optional peer; developed with **SDK 58**).
 - **Expo Go is not supported** — use a development build or bare native project.
 

package/android/build.gradle

@@ -43,6 +43,7 @@ android {
 dependencies {
   implementation "com.facebook.react:react-android"
   implementation "androidx.lifecycle:lifecycle-process:2.8.7"
+  implementation "androidx.startup:startup-runtime:1.2.0"
 
   testImplementation "androidx.test:core:1.7.0"
   testImplementation "junit:junit:4.13.2"

package/android/src/main/AndroidManifest.xml

@@ -1,2 +1,16 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools">
+
+  <application>
+    <provider
+      android:name="androidx.startup.InitializationProvider"
+      android:authorities="${applicationId}.androidx-startup"
+      android:exported="false"
+      tools:node="merge">
+      <meta-data
+        android:name="com.iconswitcher.IconSwitcherInitializer"
+        android:value="androidx.startup"
+        tools:node="merge" />
+    </provider>
+  </application>
 </manifest>

package/android/src/main/java/com/iconswitcher/IconSwitcher.kt

@@ -1,5 +1,7 @@
 package com.iconswitcher
 
+import android.app.Activity
+import android.app.Application
 import android.content.ComponentName
 import android.content.Context
 import android.content.pm.ApplicationInfo
@@ -7,6 +9,7 @@ import android.content.pm.PackageManager
 import android.os.Build
 import android.os.Handler
 import android.os.Looper
+import androidx.annotation.VisibleForTesting
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleOwner
@@ -25,9 +28,13 @@ class IconSwitcher internal constructor(
   private val packageName: String,
   private val prefs: android.content.SharedPreferences,
   private val lifecycleRegistrar: (DefaultLifecycleObserver) -> Unit,
+  private val activityLifecycleRegistrar: (Application.ActivityLifecycleCallbacks) -> Unit,
   private val isInForeground: () -> Boolean,
 ) {
   private val writeExecutor = Executors.newSingleThreadExecutor()
+  private val processStartLock = Any()
+  private var processStartInitialized = false
+  private var startedActivityCount = 0
 
   private val markedAliases: Map<String, ComponentName> by lazy { discoverMarkedAliases() }
   private val applyOn: String by lazy { readApplyOn() }
@@ -53,6 +60,9 @@ class IconSwitcher internal constructor(
         }
       }
     },
+    activityLifecycleRegistrar = { callbacks ->
+      (context.applicationContext as Application).registerActivityLifecycleCallbacks(callbacks)
+    },
     isInForeground = {
       ProcessLifecycleOwner.get().lifecycle.currentState.isAtLeast(Lifecycle.State.STARTED)
     },
@@ -67,21 +77,33 @@ class IconSwitcher internal constructor(
     packageName = context.applicationContext.packageName,
     prefs = context.applicationContext.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE),
     lifecycleRegistrar = { },
+    activityLifecycleRegistrar = { },
     isInForeground = { false },
   )
 
   fun onModuleCreate() {
-    lifecycleRegistrar(
-      object : DefaultLifecycleObserver {
-        override fun onStop(owner: LifecycleOwner) {
-          val pending = prefs.getString(KEY_PENDING, null)
-          if (pending != null) {
-            runApply(pending, deferred = true)
+    onProcessStart()
+  }
+
+  fun onProcessStart() {
+    synchronized(processStartLock) {
+      if (processStartInitialized) {
+        return
+      }
+      activityLifecycleRegistrar(createActivityLifecycleCallbacks())
+      lifecycleRegistrar(
+        object : DefaultLifecycleObserver {
+          override fun onStop(owner: LifecycleOwner) {
+            val pending = prefs.getString(KEY_PENDING, null)
+            if (pending != null) {
+              runApply(pending, deferred = true)
+            }
           }
-        }
-      },
-    )
-    runColdStart()
+        },
+      )
+      runColdStart()
+      processStartInitialized = true
+    }
   }
 
   fun current(): String {
@@ -126,6 +148,41 @@ class IconSwitcher internal constructor(
     return SetResult(STATUS_APPLIED)
   }
 
+  private fun createActivityLifecycleCallbacks(): Application.ActivityLifecycleCallbacks {
+    return object : Application.ActivityLifecycleCallbacks {
+      override fun onActivityStarted(activity: Activity) {
+        startedActivityCount++
+      }
+
+      override fun onActivityStopped(activity: Activity) {
+        // Clamped: when registered late (no startup provider, so from the module),
+        // activities that started earlier were never counted.
+        startedActivityCount = maxOf(0, startedActivityCount - 1)
+        if (startedActivityCount == 0 && !activity.isChangingConfigurations) {
+          val pending = prefs.getString(KEY_PENDING, null)
+          if (pending != null) {
+            applyPendingOnLastActivityStop(pending)
+          }
+        }
+      }
+
+      override fun onActivityCreated(activity: Activity, savedInstanceState: android.os.Bundle?) {}
+      override fun onActivityResumed(activity: Activity) {}
+      override fun onActivityPaused(activity: Activity) {}
+      override fun onActivitySaveInstanceState(activity: Activity, outState: android.os.Bundle) {}
+      override fun onActivityDestroyed(activity: Activity) {}
+    }
+  }
+
+  private fun applyPendingOnLastActivityStop(name: String) {
+    val future = submitOnWriteExecutor { applyOnExecutor(name, deferred = true) }
+    try {
+      future.get()
+    } catch (_: Exception) {
+      // applyOnExecutor stores lastError for deferred failures; never propagate here.
+    }
+  }
+
   private fun runColdStart() {
     if (prefs.getString(KEY_PENDING, null) != null) {
       return
@@ -376,5 +433,23 @@ class IconSwitcher internal constructor(
     const val STATUS_APPLIED = "applied"
     const val STATUS_PENDING = "pending"
     const val STATUS_NONE = "none"
+
+    @Volatile
+    private var instance: IconSwitcher? = null
+
+    fun getInstance(context: Context): IconSwitcher {
+      val appContext = context.applicationContext
+      instance?.let { return it }
+      return synchronized(this) {
+        instance ?: IconSwitcher(appContext).also { instance = it }
+      }
+    }
+
+    @VisibleForTesting
+    internal fun clearInstanceForTests() {
+      synchronized(this) {
+        instance = null
+      }
+    }
   }
 }

package/android/src/main/java/com/iconswitcher/IconSwitcherInitializer.kt

@@ -0,0 +1,15 @@
+package com.iconswitcher
+
+import android.content.Context
+import androidx.lifecycle.ProcessLifecycleInitializer
+import androidx.startup.Initializer
+
+class IconSwitcherInitializer : Initializer<Unit> {
+  override fun create(context: Context) {
+    IconSwitcher.getInstance(context).onProcessStart()
+  }
+
+  override fun dependencies(): List<Class<out Initializer<*>>> {
+    return listOf(ProcessLifecycleInitializer::class.java)
+  }
+}

package/android/src/main/java/com/iconswitcher/IconSwitcherModule.kt

@@ -8,7 +8,7 @@ import com.facebook.react.bridge.WritableMap
 class IconSwitcherModule(reactContext: ReactApplicationContext) :
   NativeIconSwitcherSpec(reactContext) {
 
-  private val switcher = IconSwitcher(reactApplicationContext)
+  private val switcher = IconSwitcher.getInstance(reactApplicationContext)
 
   override fun initialize() {
     super.initialize()

package/android/src/test/java/com/iconswitcher/IconSwitcherTest.kt

@@ -1,5 +1,7 @@
 package com.iconswitcher
 
+import android.app.Activity
+import android.app.Application
 import android.content.ComponentName
 import android.content.Context
 import android.content.pm.ActivityInfo
@@ -34,6 +36,7 @@ class IconSwitcherTest {
 
   @Before
   fun setUp() {
+    IconSwitcher.clearInstanceForTests()
     context = ApplicationProvider.getApplicationContext()
     context.getSharedPreferences(IconSwitcher.PREFS_NAME, Context.MODE_PRIVATE)
       .edit()
@@ -205,6 +208,7 @@ class IconSwitcherTest {
       packageName = packageName,
       prefs = prefs,
       lifecycleRegistrar = { lifecycleObserver = it },
+      activityLifecycleRegistrar = { },
       isInForeground = { false },
     )
 
@@ -331,6 +335,231 @@ class IconSwitcherTest {
     ShadowLooper.idleMainLooper()
   }
 
+  @Test
+  fun initializer_starts_singleton_without_react_module() {
+    IconSwitcherInitializer().create(context)
+    val fromInitializer = IconSwitcher.getInstance(context)
+    assertTrue(fromInitializer.isSupported)
+  }
+
+  @Test
+  fun on_process_start_twice_registers_activity_callbacks_once() {
+    var registrationCount = 0
+    val pm = mockk<PackageManager>(relaxed = true)
+    every { pm.getPackageInfo(any<String>(), any<Int>()) } returns robolectricPackageInfo(context.packageName)
+    every { pm.getApplicationInfo(any<String>(), any<Int>()) } returns robolectricApplicationInfo()
+    val switcher = switcherWithActivityCallbacks(
+      pm = pm,
+      onRegister = { registrationCount++ },
+    )
+    switcher.onProcessStart()
+    switcher.onProcessStart()
+    assertEquals(1, registrationCount)
+  }
+
+  @Test
+  fun getInstance_is_shared_between_initializer_calls() {
+    IconSwitcherInitializer().create(context)
+    val first = IconSwitcher.getInstance(context)
+    val second = IconSwitcher.getInstance(context)
+    assertTrue(first === second)
+  }
+
+  @Test
+  fun last_activity_stop_applies_pending_before_on_activity_stopped_returns() {
+    val pm = mockk<PackageManager>(relaxed = true)
+    val packageName = context.packageName
+    every { pm.getPackageInfo(any<String>(), any<Int>()) } returns robolectricPackageInfo(packageName)
+    every { pm.getApplicationInfo(any<String>(), any<Int>()) } returns robolectricApplicationInfo()
+    val settingsSlot = slot<List<PackageManager.ComponentEnabledSetting>>()
+    every { pm.setComponentEnabledSettings(capture(settingsSlot)) } returns Unit
+    every { pm.getComponentEnabledSetting(any()) } answers {
+      val component = firstArg<ComponentName>()
+      if (component.className == ".IconSwitcher_halloween") {
+        PackageManager.COMPONENT_ENABLED_STATE_ENABLED
+      } else {
+        PackageManager.COMPONENT_ENABLED_STATE_DISABLED
+      }
+    }
+
+    val prefs = context.getSharedPreferences(IconSwitcher.PREFS_NAME, Context.MODE_PRIVATE)
+    prefs.edit().putString(IconSwitcher.KEY_PENDING, "halloween").apply()
+
+    var callbacks: Application.ActivityLifecycleCallbacks? = null
+    val switcher = switcherWithActivityCallbacks(pm) { callbacks = it }
+    switcher.onProcessStart()
+
+    val activity = mockk<Activity>(relaxed = true)
+    every { activity.isChangingConfigurations } returns false
+    callbacks!!.onActivityStarted(activity)
+    callbacks!!.onActivityStopped(activity)
+
+    assertTrue(
+      settingsSlot.captured.any {
+        it.componentName!!.className == ".IconSwitcher_halloween" &&
+          it.enabledFlags == PackageManager.DONT_KILL_APP
+      },
+    )
+    assertEquals(null, prefs.getString(IconSwitcher.KEY_PENDING, null))
+    assertEquals("halloween", prefs.getString(IconSwitcher.KEY_CURRENT, null))
+  }
+
+  @Test
+  fun last_activity_stop_applies_when_callbacks_were_registered_after_it_started() {
+    // No startup provider: listening starts from the module while a screen is
+    // already open, so its start was never counted.
+    val pm = mockk<PackageManager>(relaxed = true)
+    val packageName = context.packageName
+    every { pm.getPackageInfo(any<String>(), any<Int>()) } returns robolectricPackageInfo(packageName)
+    every { pm.getApplicationInfo(any<String>(), any<Int>()) } returns robolectricApplicationInfo()
+    val settingsSlot = slot<List<PackageManager.ComponentEnabledSetting>>()
+    every { pm.setComponentEnabledSettings(capture(settingsSlot)) } returns Unit
+    every { pm.getComponentEnabledSetting(any()) } answers {
+      val component = firstArg<ComponentName>()
+      if (component.className == ".IconSwitcher_halloween") {
+        PackageManager.COMPONENT_ENABLED_STATE_ENABLED
+      } else {
+        PackageManager.COMPONENT_ENABLED_STATE_DISABLED
+      }
+    }
+
+    val prefs = context.getSharedPreferences(IconSwitcher.PREFS_NAME, Context.MODE_PRIVATE)
+    prefs.edit().putString(IconSwitcher.KEY_PENDING, "halloween").apply()
+
+    var callbacks: Application.ActivityLifecycleCallbacks? = null
+    val switcher = switcherWithActivityCallbacks(pm) { callbacks = it }
+    switcher.onProcessStart()
+
+    val activity = mockk<Activity>(relaxed = true)
+    every { activity.isChangingConfigurations } returns false
+    callbacks!!.onActivityStopped(activity)
+
+    assertTrue(settingsSlot.isCaptured)
+    assertEquals(null, prefs.getString(IconSwitcher.KEY_PENDING, null))
+    assertEquals("halloween", prefs.getString(IconSwitcher.KEY_CURRENT, null))
+  }
+
+  @Test
+  fun last_activity_stop_with_two_activities_applies_only_after_both_stop() {
+    val pm = mockk<PackageManager>(relaxed = true)
+    val packageName = context.packageName
+    every { pm.getPackageInfo(any<String>(), any<Int>()) } returns robolectricPackageInfo(packageName)
+    every { pm.getApplicationInfo(any<String>(), any<Int>()) } returns robolectricApplicationInfo()
+
+    val prefs = context.getSharedPreferences(IconSwitcher.PREFS_NAME, Context.MODE_PRIVATE)
+    prefs.edit().putString(IconSwitcher.KEY_PENDING, "halloween").apply()
+
+    var callbacks: Application.ActivityLifecycleCallbacks? = null
+    val switcher = switcherWithActivityCallbacks(pm) { callbacks = it }
+    switcher.onProcessStart()
+
+    val first = mockk<Activity>(relaxed = true)
+    val second = mockk<Activity>(relaxed = true)
+    every { first.isChangingConfigurations } returns false
+    every { second.isChangingConfigurations } returns false
+
+    callbacks!!.onActivityStarted(first)
+    callbacks!!.onActivityStarted(second)
+    callbacks!!.onActivityStopped(second)
+    verify(exactly = 0) { pm.setComponentEnabledSettings(any()) }
+
+    every { pm.getComponentEnabledSetting(any()) } answers {
+      val component = firstArg<ComponentName>()
+      if (component.className == ".IconSwitcher_halloween") {
+        PackageManager.COMPONENT_ENABLED_STATE_ENABLED
+      } else {
+        PackageManager.COMPONENT_ENABLED_STATE_DISABLED
+      }
+    }
+    every { pm.setComponentEnabledSettings(any<List<PackageManager.ComponentEnabledSetting>>()) } returns Unit
+
+    callbacks!!.onActivityStopped(first)
+    verify(exactly = 1) { pm.setComponentEnabledSettings(any()) }
+  }
+
+  @Test
+  fun last_activity_stop_during_configuration_change_does_not_apply() {
+    val pm = mockk<PackageManager>(relaxed = true)
+    every { pm.getPackageInfo(any<String>(), any<Int>()) } returns robolectricPackageInfo(context.packageName)
+    every { pm.getApplicationInfo(any<String>(), any<Int>()) } returns robolectricApplicationInfo()
+
+    context.getSharedPreferences(IconSwitcher.PREFS_NAME, Context.MODE_PRIVATE)
+      .edit()
+      .putString(IconSwitcher.KEY_PENDING, "halloween")
+      .apply()
+
+    var callbacks: Application.ActivityLifecycleCallbacks? = null
+    val switcher = switcherWithActivityCallbacks(pm) { callbacks = it }
+    switcher.onProcessStart()
+
+    val activity = mockk<Activity>(relaxed = true)
+    every { activity.isChangingConfigurations } returns true
+    callbacks!!.onActivityStarted(activity)
+    callbacks!!.onActivityStopped(activity)
+
+    verify(exactly = 0) { pm.setComponentEnabledSettings(any()) }
+  }
+
+  @Test
+  fun last_activity_stop_without_pending_does_nothing() {
+    val pm = mockk<PackageManager>(relaxed = true)
+    every { pm.getPackageInfo(any<String>(), any<Int>()) } returns robolectricPackageInfo(context.packageName)
+    every { pm.getApplicationInfo(any<String>(), any<Int>()) } returns robolectricApplicationInfo()
+
+    var callbacks: Application.ActivityLifecycleCallbacks? = null
+    val switcher = switcherWithActivityCallbacks(pm) { callbacks = it }
+    switcher.onProcessStart()
+
+    val activity = mockk<Activity>(relaxed = true)
+    every { activity.isChangingConfigurations } returns false
+    callbacks!!.onActivityStarted(activity)
+    callbacks!!.onActivityStopped(activity)
+
+    verify(exactly = 0) { pm.setComponentEnabledSettings(any()) }
+  }
+
+  @Test
+  fun last_activity_stop_apply_failure_stores_last_error_without_throwing() {
+    val pm = mockk<PackageManager>(relaxed = true)
+    every { pm.getPackageInfo(any<String>(), any<Int>()) } returns robolectricPackageInfo(context.packageName)
+    every { pm.getApplicationInfo(any<String>(), any<Int>()) } returns robolectricApplicationInfo()
+    every { pm.setComponentEnabledSettings(any<List<PackageManager.ComponentEnabledSetting>>()) } throws
+      RuntimeException("pm failed")
+    every { pm.getComponentEnabledSetting(any()) } returns PackageManager.COMPONENT_ENABLED_STATE_DISABLED
+
+    val prefs = context.getSharedPreferences(IconSwitcher.PREFS_NAME, Context.MODE_PRIVATE)
+    prefs.edit().putString(IconSwitcher.KEY_PENDING, "halloween").apply()
+
+    var callbacks: Application.ActivityLifecycleCallbacks? = null
+    val switcher = switcherWithActivityCallbacks(pm) { callbacks = it }
+    switcher.onProcessStart()
+
+    val activity = mockk<Activity>(relaxed = true)
+    every { activity.isChangingConfigurations } returns false
+    callbacks!!.onActivityStarted(activity)
+    callbacks!!.onActivityStopped(activity)
+
+    assertEquals("halloween", prefs.getString(IconSwitcher.KEY_PENDING, null))
+    assertEquals("pm failed", prefs.getString(IconSwitcher.KEY_LAST_ERROR, null))
+  }
+
+  private fun switcherWithActivityCallbacks(
+    pm: PackageManager,
+    prefs: android.content.SharedPreferences =
+      context.getSharedPreferences(IconSwitcher.PREFS_NAME, Context.MODE_PRIVATE),
+    onRegister: (Application.ActivityLifecycleCallbacks) -> Unit = { },
+  ): IconSwitcher {
+    return IconSwitcher(
+      context = context,
+      packageManager = pm,
+      packageName = context.packageName,
+      prefs = prefs,
+      lifecycleRegistrar = { },
+      activityLifecycleRegistrar = onRegister,
+      isInForeground = { false },
+    )
+  }
+
   private fun switcherWithForeground(
     pm: PackageManager,
     inForeground: Boolean,
@@ -343,6 +572,7 @@ class IconSwitcherTest {
       packageName = context.packageName,
       prefs = prefs,
       lifecycleRegistrar = { },
+      activityLifecycleRegistrar = { },
       isInForeground = { inForeground },
     )
   }

package/lib/module/remote/index.js

@@ -48,6 +48,16 @@ function _isFailedBlocked(failed, choice, retryAfterMs) {
   return Date.now() - failed.at < retryAfterMs;
 }
 
+// Shared by every syncIcon instance: callers restart syncIcon when their inputs change, and an
+// older instance's run can still be waiting on the OS (iOS shows an alert per set call). Running
+// one at a time lets the next run see the icon the previous one applied.
+let _queue = Promise.resolve();
+function _enqueue(task) {
+  const next = _queue.then(task, task);
+  _queue = next.catch(() => {});
+  return next;
+}
+
 /**
  * Fetches the remote icon choice, validates it, and applies it via {@link IconSwitcher}.
  * iOS: runs while the app is `active`. Android: calls `set` immediately (native may defer).
@@ -64,13 +74,17 @@ export async function syncIcon(options) {
     }
   };
   let inFlight = false;
-  const run = async () => {
-    if (inFlight) {
-      return;
-    }
-    inFlight = true;
+  let stopped = false;
+  const _apply = async () => {
     try {
+      // Unsubscribed while queued: the caller has moved on to a newer syncIcon.
+      if (stopped) {
+        return;
+      }
       const choice = await options.fetchChoice();
+      if (stopped) {
+        return;
+      }
       if (choice == null || choice === '') {
         return;
       }
@@ -103,6 +117,15 @@ export async function syncIcon(options) {
       }
     } catch (error) {
       reportError(error);
+    }
+  };
+  const run = async () => {
+    if (inFlight || stopped) {
+      return;
+    }
+    inFlight = true;
+    try {
+      await _enqueue(_apply);
     } finally {
       inFlight = false;
     }
@@ -119,9 +142,14 @@ export async function syncIcon(options) {
       }
     });
     runWhenActive();
-    return () => subscription.remove();
+    return () => {
+      stopped = true;
+      subscription.remove();
+    };
   }
   await run();
-  return () => {};
+  return () => {
+    stopped = true;
+  };
 }
 //# sourceMappingURL=index.js.map

package/lib/module/remote/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["AppState","Platform","IconSwitcher","STORAGE_KEY_APPLIED","STORAGE_KEY_FAILED","DEFAULT_RETRY_AFTER_MS","_createMemoryStorage","data","Map","getItem","key","get","setItem","value","set","_encodeFailed","name","JSON","stringify","at","Date","now","_decodeFailed","raw","length","parsed","parse","_isFailedBlocked","failed","choice","retryAfterMs","syncIcon","options","storage","reportError","error","onError","inFlight","run","fetchChoice","list","includes","isSupported","failedRaw","current","getCurrent","result","status","runWhenActive","currentState","OS","subscription","addEventListener","state","remove"],"sourceRoot":"../../../src","sources":["remote/index.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["AppState","Platform","IconSwitcher","STORAGE_KEY_APPLIED","STORAGE_KEY_FAILED","DEFAULT_RETRY_AFTER_MS","_createMemoryStorage","data","Map","getItem","key","get","setItem","value","set","_encodeFailed","name","JSON","stringify","at","Date","now","_decodeFailed","raw","length","parsed","parse","_isFailedBlocked","failed","choice","retryAfterMs","_queue","Promise","resolve","_enqueue","task","next","then","catch","syncIcon","options","storage","reportError","error","onError","inFlight","stopped","_apply","fetchChoice","list","includes","isSupported","failedRaw","current","getCurrent","result","status","run","runWhenActive","currentState","OS","subscription","addEventListener","state","remove"],"sourceRoot":"../../../src","sources":["remote/index.ts"],"mappings":"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","ignoreList":[]}

package/lib/typescript/src/remote/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/remote/index.ts"],"names":[],"mappings":"AAUA,MAAM,WAAW,eAAe;IAC9B,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC7C,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACpD;AAED,MAAM,WAAW,eAAe;IAC9B,WAAW,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC,CAAC;IACtD,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,4EAA4E;IAC5E,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;CACpC;AA6CD;;;GAGG;AACH,wBAAsB,QAAQ,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,IAAI,CAAC,CA+E5E"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/remote/index.ts"],"names":[],"mappings":"AAUA,MAAM,WAAW,eAAe;IAC9B,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC7C,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACpD;AAED,MAAM,WAAW,eAAe;IAC9B,WAAW,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC,CAAC;IACtD,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,4EAA4E;IAC5E,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;CACpC;AAwDD;;;GAGG;AACH,wBAAsB,QAAQ,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,IAAI,CAAC,CAkG5E"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-icon-switcher",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "description": "Switch the app icon at runtime on React Native and Expo from one config file, with the native wiring generated for you",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",

package/src/remote/index.ts

@@ -64,6 +64,17 @@ function _isFailedBlocked(
   return Date.now() - failed.at < retryAfterMs;
 }
 
+// Shared by every syncIcon instance: callers restart syncIcon when their inputs change, and an
+// older instance's run can still be waiting on the OS (iOS shows an alert per set call). Running
+// one at a time lets the next run see the icon the previous one applied.
+let _queue: Promise<void> = Promise.resolve();
+
+function _enqueue(task: () => Promise<void>): Promise<void> {
+  const next = _queue.then(task, task);
+  _queue = next.catch(() => {});
+  return next;
+}
+
 /**
  * Fetches the remote icon choice, validates it, and applies it via {@link IconSwitcher}.
  * iOS: runs while the app is `active`. Android: calls `set` immediately (native may defer).
@@ -81,14 +92,18 @@ export async function syncIcon(options: SyncIconOptions): Promise<() => void> {
   };
 
   let inFlight = false;
+  let stopped = false;
 
-  const run = async (): Promise<void> => {
-    if (inFlight) {
-      return;
-    }
-    inFlight = true;
+  const _apply = async (): Promise<void> => {
     try {
+      // Unsubscribed while queued: the caller has moved on to a newer syncIcon.
+      if (stopped) {
+        return;
+      }
       const choice = await options.fetchChoice();
+      if (stopped) {
+        return;
+      }
       if (choice == null || choice === '') {
         return;
       }
@@ -124,6 +139,16 @@ export async function syncIcon(options: SyncIconOptions): Promise<() => void> {
       }
     } catch (error) {
       reportError(error);
+    }
+  };
+
+  const run = async (): Promise<void> => {
+    if (inFlight || stopped) {
+      return;
+    }
+    inFlight = true;
+    try {
+      await _enqueue(_apply);
     } finally {
       inFlight = false;
     }
@@ -142,9 +167,14 @@ export async function syncIcon(options: SyncIconOptions): Promise<() => void> {
       }
     });
     runWhenActive();
-    return () => subscription.remove();
+    return () => {
+      stopped = true;
+      subscription.remove();
+    };
   }
 
   await run();
-  return () => {};
+  return () => {
+    stopped = true;
+  };
 }