Merge remote-tracking branch 'refs/remotes/origin/feat/support-advanced-UI-customization' into chore/-Remove-deprecated-APIS

# Conflicts:
#	CHANGELOG.md
#	android/src/main/java/com/instabug/flutter/modules/InstabugApi.java
#	android/src/test/java/com/instabug/flutter/InstabugApiTest.java
#	example/ios/InstabugTests/InstabugApiTests.m
#	ios/Classes/Modules/InstabugApi.m
#	lib/instabug_flutter.dart
#	lib/src/modules/instabug.dart
#	pigeons/instabug.api.dart
#	test/instabug_test.dart

Author: ahmedAlaaInstabug

CHANGELOG.md

@@ -2,18 +2,22 @@
 
 ## [Unreleased](https://github.com/Instabug/Instabug-Flutter/compare/v15.0.2...dev)
 
-### Changed
-
-- **BREAKING** Remove deprecated APIs ([#614](https://github.com/Instabug/Instabug-Flutter/pull/614)). See migration guide for more details.
 ### Added
 
 - Add support for Advanced UI customization with comprehensive theming capabilities ([#599](https://github.com/Instabug/Instabug-Flutter/pull/599))
+- 
+- Add support for App variant. ([#585](https://github.com/Instabug/Instabug-Flutter/pull/585))
+
+### Changed
+
+- **BREAKING** Remove deprecated APIs ([#614](https://github.com/Instabug/Instabug-Flutter/pull/614)). See migration guide for more details.
 
 
 ## [15.0.2](https://github.com/Instabug/Instabug-Flutter/compare/v14.3.0...15.0.2)  (Jul 7, 2025)
 
 ### Added
 
+
 - Add support for xCode 16. ([#574](https://github.com/Instabug/Instabug-Flutter/pull/574))
 
 - Add support for BugReporting user consents. ([#573](https://github.com/Instabug/Instabug-Flutter/pull/573))

android/src/main/java/com/instabug/flutter/modules/InstabugApi.java

@@ -7,9 +7,11 @@
 import android.net.Uri;
 import android.graphics.Typeface;
 import android.util.Log;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
+
 import com.instabug.flutter.generated.InstabugPigeon;
 import com.instabug.flutter.util.ArgsRegistry;
 import com.instabug.flutter.util.Reflection;
@@ -31,9 +33,11 @@
 import com.instabug.library.invocation.InstabugInvocationEvent;
 import com.instabug.library.model.NetworkLog;
 import com.instabug.library.ui.onboarding.WelcomeMessage;
+
 import io.flutter.FlutterInjector;
 import io.flutter.embedding.engine.loader.FlutterLoader;
 import io.flutter.plugin.common.BinaryMessenger;
+
 import org.jetbrains.annotations.NotNull;
 import org.json.JSONObject;
 
@@ -103,10 +107,12 @@ public Boolean isEnabled() {
 
     @NotNull
     @Override
-    public Boolean isBuilt() { return Instabug.isBuilt(); }
+    public Boolean isBuilt() {
+        return Instabug.isBuilt();
+    }
 
     @Override
-    public void init(@NonNull String token, @NonNull List<String> invocationEvents, @NonNull String debugLogsLevel) {
+    public void init(@NonNull String token, @NonNull List<String> invocationEvents, @NonNull String debugLogsLevel, @Nullable String appVariant) {
         setCurrentPlatform();
 
         InstabugInvocationEvent[] invocationEventsArray = new InstabugInvocationEvent[invocationEvents.size()];
@@ -117,11 +123,14 @@ public void init(@NonNull String token, @NonNull List<String> invocationEvents,
 
         final Application application = (Application) context;
         final int parsedLogLevel = ArgsRegistry.sdkLogLevels.get(debugLogsLevel);
-
-        new Instabug.Builder(application, token)
+        Instabug.Builder builder = new Instabug.Builder(application, token)
                 .setInvocationEvents(invocationEventsArray)
-                .setSdkDebugLogsLevel(parsedLogLevel)
-                .build();
+                .setSdkDebugLogsLevel(parsedLogLevel);
+        if (appVariant != null) {
+            builder.setAppVariant(appVariant);
+        }
+
+        builder.build();
 
         Instabug.setScreenshotProvider(screenshotProvider);
     }
@@ -147,6 +156,17 @@ public void setUserData(@NonNull String data) {
         Instabug.setUserData(data);
     }
 
+    @Override
+    public void setAppVariant(@NonNull String appVariant) {
+        try {
+            Instabug.setAppVariant(appVariant);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
+
     @Override
     public void logUserEvent(@NonNull String name) {
         Instabug.logUserEvent(name);
@@ -487,21 +507,21 @@ public void willRedirectToStore() {
         Instabug.willRedirectToStore();
     }
 
-    
+
     @Override
     public void setNetworkLogBodyEnabled(@NonNull Boolean isEnabled) {
-                try {
-                    Instabug.setNetworkLogBodyEnabled(isEnabled);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
+        try {
+            Instabug.setNetworkLogBodyEnabled(isEnabled);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
     @Override
     public void setTheme(@NonNull Map<String, Object> themeConfig) {
         try {
             Log.d(TAG, "setTheme called with config: " + themeConfig.toString());
-            
+
             com.instabug.library.model.IBGTheme.Builder builder = new com.instabug.library.model.IBGTheme.Builder();
 
             if (themeConfig.containsKey("primaryColor")) {
@@ -548,7 +568,7 @@ public void setTheme(@NonNull Map<String, Object> themeConfig) {
 
     /**
      * Retrieves a color value from the Map.
-     * 
+     *
      * @param map The Map object.
      * @param key The key to look for.
      * @return The parsed color as an integer, or black if missing or invalid.
@@ -567,7 +587,7 @@ private int getColor(Map<String, Object> map, String key) {
 
     /**
      * Retrieves a text style from the Map.
-     * 
+     *
      * @param map The Map object.
      * @param key The key to look for.
      * @return The corresponding Typeface style, or Typeface.NORMAL if missing or invalid.
@@ -596,7 +616,7 @@ private int getTextStyle(Map<String, Object> map, String key) {
 
     /**
      * Sets a font on the theme builder if the font configuration is present in the theme config.
-     * 
+     *
      * @param themeConfig The theme configuration map
      * @param builder The theme builder
      * @param fileKey The key for font file path
@@ -625,17 +645,17 @@ private void setFontIfPresent(Map<String, Object> themeConfig, com.instabug.libr
 
     private Typeface getTypeface(Map<String, Object> map, String fileKey, String assetKey) {
         String fontName = null;
-        
+
         if (assetKey != null && map.containsKey(assetKey) && map.get(assetKey) != null) {
             fontName = (String) map.get(assetKey);
         } else if (fileKey != null && map.containsKey(fileKey) && map.get(fileKey) != null) {
             fontName = (String) map.get(fileKey);
         }
-        
+
         if (fontName == null) {
             return Typeface.DEFAULT;
         }
-        
+
         try {
             String assetPath = "fonts/" + fontName;
             return Typeface.createFromAsset(context.getAssets(), assetPath);
@@ -647,6 +667,17 @@ private Typeface getTypeface(Map<String, Object> map, String fileKey, String ass
             }
         }
     }
-
+    /**
+     * Enables or disables displaying in full-screen mode, hiding the status and navigation bars.
+     * @param isEnabled A boolean to enable/disable setFullscreen.
+     */
+    @Override
+    public void setFullscreen(@NonNull final Boolean isEnabled) {
+        try {
+            Instabug.setFullscreen(isEnabled);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 
 }

android/src/test/java/com/instabug/flutter/InstabugApiTest.java

@@ -134,6 +134,8 @@ public void testSetCurrentPlatform() {
     @Test
     public void testSdkInit() {
         String token = "app-token";
+        String appVariant = "app-variant";
+
         List<String> invocationEvents = Collections.singletonList("InvocationEvent.floatingButton");
         String logLevel = "LogLevel.error";
 
@@ -145,7 +147,7 @@ public void testSdkInit() {
             when(mock.setSdkDebugLogsLevel(anyInt())).thenReturn(mock);
         });
 
-        api.init(token, invocationEvents, logLevel);
+        api.init(token, invocationEvents, logLevel,appVariant);
 
         Instabug.Builder builder = mInstabugBuilder.constructed().get(0);
 
@@ -157,6 +159,8 @@ public void testSdkInit() {
         );
         verify(builder).setInvocationEvents(InstabugInvocationEvent.FLOATING_BUTTON);
         verify(builder).setSdkDebugLogsLevel(LogLevel.ERROR);
+        verify(builder).setAppVariant(appVariant);
+
         verify(builder).build();
 
         // Sets screenshot provider
@@ -625,6 +629,14 @@ public void testSetNetworkLogBodyEnabled() {
         mInstabug.verify(() -> Instabug.setNetworkLogBodyEnabled(true));
     }
 
+    @Test
+    public void testSetAppVariant() {
+        String appVariant = "app-variant";
+        api.setAppVariant(appVariant);
+
+        mInstabug.verify(() -> Instabug.setAppVariant(appVariant));
+    }
+
     @Test
     public void testSetNetworkLogBodyDisabled() {
         api.setNetworkLogBodyEnabled(false);
@@ -647,7 +659,7 @@ public void testSetThemeWithAllProperties() {
         themeConfig.put("secondaryFontAsset", "assets/fonts/CustomFont-Bold.ttf");
         themeConfig.put("ctaFontAsset", "assets/fonts/CustomFont-Italic.ttf");
 
-        MockedConstruction<com.instabug.library.model.IBGTheme.Builder> mThemeBuilder = 
+        MockedConstruction<com.instabug.library.model.IBGTheme.Builder> mThemeBuilder =
             mockConstruction(com.instabug.library.model.IBGTheme.Builder.class, (mock, context) -> {
                 when(mock.setPrimaryColor(anyInt())).thenReturn(mock);
                 when(mock.setBackgroundColor(anyInt())).thenReturn(mock);
@@ -666,7 +678,7 @@ public void testSetThemeWithAllProperties() {
         api.setTheme(themeConfig);
 
         com.instabug.library.model.IBGTheme.Builder builder = mThemeBuilder.constructed().get(0);
-        
+
         verify(builder).setPrimaryColor(anyInt());
         verify(builder).setBackgroundColor(anyInt());
         verify(builder).setTitleTextColor(anyInt());
@@ -675,9 +687,27 @@ public void testSetThemeWithAllProperties() {
         verify(builder).setPrimaryTextStyle(Typeface.BOLD);
         verify(builder).setSecondaryTextStyle(Typeface.ITALIC);
         verify(builder).setCtaTextStyle(Typeface.BOLD_ITALIC);
-        
+
         mInstabug.verify(() -> Instabug.setTheme(any(com.instabug.library.model.IBGTheme.class)));
     }
 
+    @Test
+    public void testSetFullscreen() {
+        boolean isEnabled = true;
+
+        api.setFullscreen(isEnabled);
+
+        mInstabug.verify(() -> Instabug.setFullscreen(isEnabled));
+    }
+
+    @Test
+    public void testSetFullscreenDisabled() {
+        boolean isEnabled = false;
+
+        api.setFullscreen(isEnabled);
+
+        mInstabug.verify(() -> Instabug.setFullscreen(isEnabled));
+    }
+
 
 }

example/ios/InstabugTests/InstabugApiTests.m

@@ -38,15 +38,22 @@ - (void)testSetEnabled {
 
 - (void)testInit {
     NSString *token = @"app-token";
+    NSString *appVariant = @"app-variant";
+
     NSArray<NSString *> *invocationEvents = @[@"InvocationEvent.floatingButton", @"InvocationEvent.screenshot"];
     NSString *logLevel = @"LogLevel.error";
     FlutterError *error;
 
-    [self.api initToken:token invocationEvents:invocationEvents debugLogsLevel:logLevel error:&error];
+    [self.api initToken:token invocationEvents:invocationEvents debugLogsLevel:logLevel appVariant:appVariant error:&error];
 
     OCMVerify([self.mInstabug setCurrentPlatform:IBGPlatformFlutter]);
+
     OCMVerify([self.mInstabug setSdkDebugLogsLevel:IBGSDKDebugLogsLevelError]);
+
     OCMVerify([self.mInstabug startWithToken:token invocationEvents:(IBGInvocationEventFloatingButton | IBGInvocationEventScreenshot)]);
+
+    XCTAssertEqual(Instabug.appVariant, appVariant);
+
 }
 
 - (void)testShow {
@@ -598,20 +605,30 @@ - (void)testSetThemeWithAllProperties {
         @"secondaryFontPath": @"assets/fonts/CustomFont-Bold.ttf",
         @"ctaFontPath": @"assets/fonts/CustomFont-Italic.ttf"
     };
-    
+
     id mockTheme = OCMClassMock([IBGTheme class]);
     OCMStub([mockTheme primaryColor]).andReturn([UIColor redColor]);
     OCMStub([mockTheme backgroundColor]).andReturn([UIColor whiteColor]);
     OCMStub([mockTheme titleTextColor]).andReturn([UIColor blackColor]);
     OCMStub([mockTheme primaryTextColor]).andReturn([UIColor darkGrayColor]);
     OCMStub([mockTheme secondaryTextColor]).andReturn([UIColor grayColor]);
     OCMStub([mockTheme callToActionTextColor]).andReturn([UIColor redColor]);
-    
+
     FlutterError *error;
-    
+
     [self.api setThemeThemeConfig:themeConfig error:&error];
-    
+
     OCMVerify([self.mInstabug setTheme:[OCMArg isNotNil]]);
 }
 
+- (void)testSetFullscreen {
+    NSNumber *isEnabled = @1;
+    FlutterError *error;
+
+    [self.api setFullscreenIsEnabled:isEnabled error:&error];
+
+    // Since this is an empty implementation, we just verify the method can be called without error
+    XCTAssertNil(error);
+}
+
 @end

example/ios/Podfile

@@ -30,7 +30,6 @@ target 'Runner' do
 
   use_frameworks!
   use_modular_headers!
-
   flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
 end
 

example/lib/main.dart

@@ -46,10 +46,10 @@ void main() {
       WidgetsFlutterBinding.ensureInitialized();
 
       Instabug.init(
-        token: 'ed6f659591566da19b67857e1b9d40ab',
-        invocationEvents: [InvocationEvent.floatingButton],
-        debugLogsLevel: LogLevel.verbose,
-      );
+          token: 'ed6f659591566da19b67857e1b9d40ab',
+          invocationEvents: [InvocationEvent.floatingButton],
+          debugLogsLevel: LogLevel.verbose,
+          appVariant: 'variant 1');
 
       FlutterError.onError = (FlutterErrorDetails details) {
         Zone.current.handleUncaughtError(details.exception, details.stack!);