From 54cba9bc3575dd921aaac861aeb42cddd6644bdd Mon Sep 17 00:00:00 2001 From: AyaMahmoud148 Date: Mon, 7 Jul 2025 13:23:56 +0300 Subject: [PATCH 01/26] feat: Support Advanced UI customization --- .../RNInstabugReactnativeModule.java | 204 ++++++++++++++++++ .../RNInstabugReactnativeModuleTest.java | 71 ++++++ .../ios/InstabugTests/InstabugSampleTests.m | 67 ++++++ examples/default/react-native.config.js | 3 + ios/RNInstabug/InstabugReactBridge.h | 2 + ios/RNInstabug/InstabugReactBridge.m | 161 ++++++++++++++ src/index.ts | 10 +- src/models/ThemeConfig.ts | 34 +++ src/modules/Instabug.ts | 48 +++++ src/native/NativeInstabug.ts | 6 +- 10 files changed, 604 insertions(+), 2 deletions(-) create mode 100644 examples/default/react-native.config.js create mode 100644 src/models/ThemeConfig.ts diff --git a/android/src/main/java/com/instabug/reactlibrary/RNInstabugReactnativeModule.java b/android/src/main/java/com/instabug/reactlibrary/RNInstabugReactnativeModule.java index 17f48656f..7147b856c 100644 --- a/android/src/main/java/com/instabug/reactlibrary/RNInstabugReactnativeModule.java +++ b/android/src/main/java/com/instabug/reactlibrary/RNInstabugReactnativeModule.java @@ -6,10 +6,14 @@ import android.app.Application; import android.graphics.Bitmap; +import android.graphics.Color; +import android.graphics.Typeface; import android.net.Uri; import android.util.Log; import android.view.View; +import com.facebook.react.bridge.ReactApplicationContext; + import androidx.annotation.NonNull; import androidx.annotation.UiThread; @@ -45,6 +49,7 @@ import com.instabug.library.internal.module.InstabugLocale; import com.instabug.library.invocation.InstabugInvocationEvent; import com.instabug.library.logging.InstabugLog; +import com.instabug.library.model.IBGTheme; import com.instabug.library.model.NetworkLog; import com.instabug.library.model.Report; import com.instabug.library.ui.onboarding.WelcomeMessage; @@ -1351,4 +1356,203 @@ public void run() { } }); } + /** + * Sets the theme for Instabug using a configuration object. + * + * @param themeConfig A ReadableMap containing theme properties such as colors, fonts, and text styles. + */ + @ReactMethod + public void setTheme(final ReadableMap themeConfig) { + MainThreadHandler.runOnMainThread(new Runnable() { + @Override + public void run() { + try { + com.instabug.library.model.IBGTheme.Builder builder = new com.instabug.library.model.IBGTheme.Builder(); + + if (themeConfig.hasKey("primaryColor")) { + builder.setPrimaryColor(getColor(themeConfig, "primaryColor")); + } + if (themeConfig.hasKey("secondaryTextColor")) { + builder.setSecondaryTextColor(getColor(themeConfig, "secondaryTextColor")); + } + if (themeConfig.hasKey("primaryTextColor")) { + builder.setPrimaryTextColor(getColor(themeConfig, "primaryTextColor")); + } + if (themeConfig.hasKey("titleTextColor")) { + builder.setTitleTextColor(getColor(themeConfig, "titleTextColor")); + } + if (themeConfig.hasKey("backgroundColor")) { + builder.setBackgroundColor(getColor(themeConfig, "backgroundColor")); + } + + if (themeConfig.hasKey("primaryTextStyle")) { + builder.setPrimaryTextStyle(getTextStyle(themeConfig, "primaryTextStyle")); + } + if (themeConfig.hasKey("secondaryTextStyle")) { + builder.setSecondaryTextStyle(getTextStyle(themeConfig, "secondaryTextStyle")); + } + if (themeConfig.hasKey("ctaTextStyle")) { + builder.setCtaTextStyle(getTextStyle(themeConfig, "ctaTextStyle")); + } + if (themeConfig.hasKey("primaryFontPath") || themeConfig.hasKey("primaryFontAsset")) { + Typeface primaryTypeface = getTypeface(themeConfig, "primaryFontPath", "primaryFontAsset"); + if (primaryTypeface != null) { + builder.setPrimaryTextFont(primaryTypeface); + } else { + Log.e("InstabugModule", "Failed to load primary font"); + } + } + + if (themeConfig.hasKey("secondaryFontPath") || themeConfig.hasKey("secondaryFontAsset")) { + Typeface secondaryTypeface = getTypeface(themeConfig, "secondaryFontPath", "secondaryFontAsset"); + if (secondaryTypeface != null) { + builder.setSecondaryTextFont(secondaryTypeface); + } else { + Log.e("InstabugModule", "Failed to load secondary font"); + } + } + + if (themeConfig.hasKey("ctaFontPath") || themeConfig.hasKey("ctaFontAsset")) { + Typeface ctaTypeface = getTypeface(themeConfig, "ctaFontPath", "ctaFontAsset"); + if (ctaTypeface != null) { + builder.setCtaTextFont(ctaTypeface); + } else { + Log.e("InstabugModule", "Failed to load CTA font"); + } + } + + IBGTheme theme = builder.build(); + Instabug.setTheme(theme); + + } catch (Exception e) { + e.printStackTrace(); + } + } + }); + } + + /** + * Retrieves a color value from the ReadableMap. + * + * @param map The ReadableMap object. + * @param key The key to look for. + * @return The parsed color as an integer, or black if missing or invalid. + */ + private int getColor(ReadableMap map, String key) { + try { + if (map != null && map.hasKey(key) && !map.isNull(key)) { + String colorString = map.getString(key); + return Color.parseColor(colorString); + } + } catch (Exception e) { + e.printStackTrace(); + } + return Color.BLACK; + } + + /** + * Retrieves a text style from the ReadableMap. + * + * @param map The ReadableMap object. + * @param key The key to look for. + * @return The corresponding Typeface style, or Typeface.NORMAL if missing or invalid. + */ + private int getTextStyle(ReadableMap map, String key) { + try { + if (map != null && map.hasKey(key) && !map.isNull(key)) { + String style = map.getString(key); + switch (style.toLowerCase()) { + case "bold": + return Typeface.BOLD; + case "italic": + return Typeface.ITALIC; + case "bold_italic": + return Typeface.BOLD_ITALIC; + case "normal": + default: + return Typeface.NORMAL; + } + } + } catch (Exception e) { + e.printStackTrace(); + } + return Typeface.NORMAL; + } + +private Typeface getTypeface(ReadableMap map, String fileKey, String assetKey) { + try { + if (fileKey != null && map.hasKey(fileKey) && !map.isNull(fileKey)) { + String fontPath = map.getString(fileKey); + String fileName = getFileName(fontPath); + + try { + Typeface typeface = Typeface.create(fileName, Typeface.NORMAL); + if (typeface != null && !typeface.equals(Typeface.DEFAULT)) { + return typeface; + } + } catch (Exception e) { + e.printStackTrace(); + } + + try { + Typeface typeface = Typeface.createFromAsset(getReactApplicationContext().getAssets(), "fonts/" + fileName); + return typeface; + } catch (Exception e) { + e.printStackTrace(); + } + } + + if (assetKey != null && map.hasKey(assetKey) && !map.isNull(assetKey)) { + String assetPath = map.getString(assetKey); + String fileName = getFileName(assetPath); + try { + Typeface typeface = Typeface.createFromAsset(getReactApplicationContext().getAssets(), "fonts/" + fileName); + return typeface; + } catch (Exception e) { + e.printStackTrace(); + } + } + } catch (Exception e) { + e.printStackTrace(); + } + + return Typeface.DEFAULT; +} + +/** + * Extracts the filename from a path, removing any directory prefixes. + * + * @param path The full path to the file + * @return Just the filename with extension + */ +private String getFileName(String path) { + if (path == null || path.isEmpty()) { + return path; + } + + int lastSeparator = Math.max(path.lastIndexOf('/'), path.lastIndexOf('\\')); + if (lastSeparator >= 0 && lastSeparator < path.length() - 1) { + return path.substring(lastSeparator + 1); + } + + return path; +} + + /** + * Enables or disables displaying in full-screen mode, hiding the status and navigation bars. + * @param isEnabled A boolean to enable/disable setFullscreen. + */ + @ReactMethod + public void setFullscreen(final boolean isEnabled) { + MainThreadHandler.runOnMainThread(new Runnable() { + @Override + public void run() { + try { + Instabug.setFullscreen(isEnabled); + } catch (Exception e) { + e.printStackTrace(); + } + } + }); + } } diff --git a/android/src/test/java/com/instabug/reactlibrary/RNInstabugReactnativeModuleTest.java b/android/src/test/java/com/instabug/reactlibrary/RNInstabugReactnativeModuleTest.java index f4f6f9bc1..072e33e7a 100644 --- a/android/src/test/java/com/instabug/reactlibrary/RNInstabugReactnativeModuleTest.java +++ b/android/src/test/java/com/instabug/reactlibrary/RNInstabugReactnativeModuleTest.java @@ -704,4 +704,75 @@ public void testGetNetworkBodyMaxSize_resolvesPromiseWithExpectedValue() { verify(promise).resolve(expected); } + @Test + public void testEnablSetFullScreen() { + boolean isEnabled = true; + + // when + rnModule.setFullscreen(isEnabled); + + // then + verify(Instabug.class, times(1)); + Instabug.setFullscreen(isEnabled); + } + + @Test + public void testDisableSetFullScreen() { + // given + boolean isEnabled = false; + + // when + rnModule.setFullscreen(isEnabled); + + // then + verify(Instabug.class, times(1)); + Instabug.setFullscreen(isEnabled); + } + + @Test + public void testSetTheme() { + // given + JavaOnlyMap themeConfig = new JavaOnlyMap(); + themeConfig.putString("primaryColor", "#FF0000"); + themeConfig.putString("primaryTextColor", "#00FF00"); + themeConfig.putString("secondaryTextColor", "#0000FF"); + themeConfig.putString("titleTextColor", "#FFFF00"); + themeConfig.putString("backgroundColor", "#FF00FF"); + themeConfig.putString("primaryTextStyle", "bold"); + themeConfig.putString("secondaryTextStyle", "italic"); + themeConfig.putString("ctaTextStyle", "bold"); + themeConfig.putString("primaryFontPath", "TestFont.ttf"); + themeConfig.putString("secondaryFontPath", "fonts/AnotherFont.ttf"); + themeConfig.putString("ctaFontPath", "./assets/fonts/CTAFont.ttf"); + + // Mock IBGTheme.Builder + com.instabug.library.model.IBGTheme.Builder mockBuilder = mock(com.instabug.library.model.IBGTheme.Builder.class); + com.instabug.library.model.IBGTheme mockTheme = mock(com.instabug.library.model.IBGTheme.class); + + try (MockedConstruction mockedBuilder = mockConstruction( + com.instabug.library.model.IBGTheme.Builder.class, + (mock, context) -> { + when(mock.setPrimaryColor(anyInt())).thenReturn(mock); + when(mock.setPrimaryTextColor(anyInt())).thenReturn(mock); + when(mock.setSecondaryTextColor(anyInt())).thenReturn(mock); + when(mock.setTitleTextColor(anyInt())).thenReturn(mock); + when(mock.setBackgroundColor(anyInt())).thenReturn(mock); + when(mock.setPrimaryTextStyle(anyInt())).thenReturn(mock); + when(mock.setSecondaryTextStyle(anyInt())).thenReturn(mock); + when(mock.setCtaTextStyle(anyInt())).thenReturn(mock); + when(mock.setPrimaryTextFont(any())).thenReturn(mock); + when(mock.setSecondaryTextFont(any())).thenReturn(mock); + when(mock.setCtaTextFont(any())).thenReturn(mock); + when(mock.build()).thenReturn(mockTheme); + })) { + + // when + rnModule.setTheme(themeConfig); + + // then + verify(Instabug.class, times(1)); + Instabug.setTheme(mockTheme); + } + } + } diff --git a/examples/default/ios/InstabugTests/InstabugSampleTests.m b/examples/default/ios/InstabugTests/InstabugSampleTests.m index ded37c3af..5591a0287 100644 --- a/examples/default/ios/InstabugTests/InstabugSampleTests.m +++ b/examples/default/ios/InstabugTests/InstabugSampleTests.m @@ -651,6 +651,73 @@ - (void)testGetNetworkBodyMaxSize { OCMVerify(ClassMethod([mock getNetworkBodyMaxSize])); } +- (void)testSetTheme { + id mock = OCMClassMock([Instabug class]); + id mockTheme = OCMClassMock([IBGTheme class]); + + // Create theme configuration dictionary + NSDictionary *themeConfig = @{ + @"primaryColor": @"#FF0000", + @"backgroundColor": @"#00FF00", + @"titleTextColor": @"#0000FF", + @"subtitleTextColor": @"#FFFF00", + @"primaryTextColor": @"#FF00FF", + @"secondaryTextColor": @"#00FFFF", + @"callToActionTextColor": @"#800080", + @"headerBackgroundColor": @"#808080", + @"footerBackgroundColor": @"#C0C0C0", + @"rowBackgroundColor": @"#FFFFFF", + @"selectedRowBackgroundColor": @"#E6E6FA", + @"rowSeparatorColor": @"#D3D3D3", + @"primaryFontPath": @"TestFont.ttf", + @"secondaryFontPath": @"fonts/AnotherFont.ttf", + @"ctaFontPath": @"./assets/fonts/CTAFont.ttf" + }; + + // Mock IBGTheme creation and configuration + OCMStub([mockTheme primaryColor]).andReturn([UIColor redColor]); + OCMStub([mockTheme backgroundColor]).andReturn([UIColor greenColor]); + OCMStub([mockTheme titleTextColor]).andReturn([UIColor blueColor]); + OCMStub([mockTheme subtitleTextColor]).andReturn([UIColor yellowColor]); + OCMStub([mockTheme primaryTextColor]).andReturn([UIColor magentaColor]); + OCMStub([mockTheme secondaryTextColor]).andReturn([UIColor cyanColor]); + OCMStub([mockTheme callToActionTextColor]).andReturn([UIColor purpleColor]); + OCMStub([mockTheme headerBackgroundColor]).andReturn([UIColor grayColor]); + OCMStub([mockTheme footerBackgroundColor]).andReturn([UIColor lightGrayColor]); + OCMStub([mockTheme rowBackgroundColor]).andReturn([UIColor whiteColor]); + OCMStub([mockTheme selectedRowBackgroundColor]).andReturn([UIColor redColor]); + OCMStub([mockTheme rowSeparatorColor]).andReturn([UIColor lightGrayColor]); + OCMStub([mockTheme primaryTextFont]).andReturn([UIFont systemFontOfSize:17.0]); + OCMStub([mockTheme secondaryTextFont]).andReturn([UIFont systemFontOfSize:17.0]); + OCMStub([mockTheme callToActionTextFont]).andReturn([UIFont systemFontOfSize:17.0]); + + // Mock theme property setting + OCMStub([mockTheme setPrimaryColor:[OCMArg any]]).andReturn(mockTheme); + OCMStub([mockTheme setBackgroundColor:[OCMArg any]]).andReturn(mockTheme); + OCMStub([mockTheme setTitleTextColor:[OCMArg any]]).andReturn(mockTheme); + OCMStub([mockTheme setSubtitleTextColor:[OCMArg any]]).andReturn(mockTheme); + OCMStub([mockTheme setPrimaryTextColor:[OCMArg any]]).andReturn(mockTheme); + OCMStub([mockTheme setSecondaryTextColor:[OCMArg any]]).andReturn(mockTheme); + OCMStub([mockTheme setCallToActionTextColor:[OCMArg any]]).andReturn(mockTheme); + OCMStub([mockTheme setHeaderBackgroundColor:[OCMArg any]]).andReturn(mockTheme); + OCMStub([mockTheme setFooterBackgroundColor:[OCMArg any]]).andReturn(mockTheme); + OCMStub([mockTheme setRowBackgroundColor:[OCMArg any]]).andReturn(mockTheme); + OCMStub([mockTheme setSelectedRowBackgroundColor:[OCMArg any]]).andReturn(mockTheme); + OCMStub([mockTheme setRowSeparatorColor:[OCMArg any]]).andReturn(mockTheme); + OCMStub([mockTheme setPrimaryTextFont:[OCMArg any]]).andReturn(mockTheme); + OCMStub([mockTheme setSecondaryTextFont:[OCMArg any]]).andReturn(mockTheme); + OCMStub([mockTheme setCallToActionTextFont:[OCMArg any]]).andReturn(mockTheme); + + // Mock Instabug.theme property + OCMStub([mock theme]).andReturn(mockTheme); + OCMStub([mock setTheme:[OCMArg any]]); + + // Call the method + [self.instabugBridge setTheme:themeConfig]; + + // Verify that setTheme was called + OCMVerify([mock setTheme:[OCMArg any]]); +} @end diff --git a/examples/default/react-native.config.js b/examples/default/react-native.config.js new file mode 100644 index 000000000..cbdf34c94 --- /dev/null +++ b/examples/default/react-native.config.js @@ -0,0 +1,3 @@ +module.exports = { + assets: ['./assets/fonts/'], +}; diff --git a/ios/RNInstabug/InstabugReactBridge.h b/ios/RNInstabug/InstabugReactBridge.h index 1fe5505d3..c12b59b1e 100644 --- a/ios/RNInstabug/InstabugReactBridge.h +++ b/ios/RNInstabug/InstabugReactBridge.h @@ -42,6 +42,8 @@ - (void)setPrimaryColor:(UIColor *)color; +- (void)setTheme:(NSDictionary *)themeConfig; + - (void)appendTags:(NSArray *)tags; - (void)resetTags; diff --git a/ios/RNInstabug/InstabugReactBridge.m b/ios/RNInstabug/InstabugReactBridge.m index a48851ba8..a7efd17ba 100644 --- a/ios/RNInstabug/InstabugReactBridge.m +++ b/ios/RNInstabug/InstabugReactBridge.m @@ -173,6 +173,167 @@ - (dispatch_queue_t)methodQueue { Instabug.tintColor = color; } +RCT_EXPORT_METHOD(setTheme:(NSDictionary *)themeConfig) { + IBGTheme *theme = [[IBGTheme alloc] init]; + + if (themeConfig[@"primaryColor"]) { + NSString *colorString = themeConfig[@"primaryColor"]; + UIColor *color = [self colorFromHexString:colorString]; + if (color) { + theme.primaryColor = color; + } + } + + if (themeConfig[@"backgroundColor"]) { + NSString *colorString = themeConfig[@"backgroundColor"]; + UIColor *color = [self colorFromHexString:colorString]; + if (color) { + theme.backgroundColor = color; + } + } + + if (themeConfig[@"titleTextColor"]) { + NSString *colorString = themeConfig[@"titleTextColor"]; + UIColor *color = [self colorFromHexString:colorString]; + if (color) { + theme.titleTextColor = color; + } + } + + if (themeConfig[@"subtitleTextColor"]) { + NSString *colorString = themeConfig[@"subtitleTextColor"]; + UIColor *color = [self colorFromHexString:colorString]; + if (color) { + theme.subtitleTextColor = color; + } + } + + if (themeConfig[@"primaryTextColor"]) { + NSString *colorString = themeConfig[@"primaryTextColor"]; + UIColor *color = [self colorFromHexString:colorString]; + if (color) { + theme.primaryTextColor = color; + } + } + + if (themeConfig[@"secondaryTextColor"]) { + NSString *colorString = themeConfig[@"secondaryTextColor"]; + UIColor *color = [self colorFromHexString:colorString]; + if (color) { + theme.secondaryTextColor = color; + } + } + + if (themeConfig[@"callToActionTextColor"]) { + NSString *colorString = themeConfig[@"callToActionTextColor"]; + UIColor *color = [self colorFromHexString:colorString]; + if (color) { + theme.callToActionTextColor = color; + } + } + + if (themeConfig[@"headerBackgroundColor"]) { + NSString *colorString = themeConfig[@"headerBackgroundColor"]; + UIColor *color = [self colorFromHexString:colorString]; + if (color) { + theme.headerBackgroundColor = color; + } + } + + if (themeConfig[@"footerBackgroundColor"]) { + NSString *colorString = themeConfig[@"footerBackgroundColor"]; + UIColor *color = [self colorFromHexString:colorString]; + if (color) { + theme.footerBackgroundColor = color; + } + } + + if (themeConfig[@"rowBackgroundColor"]) { + NSString *colorString = themeConfig[@"rowBackgroundColor"]; + UIColor *color = [self colorFromHexString:colorString]; + if (color) { + theme.rowBackgroundColor = color; + } + } + + if (themeConfig[@"selectedRowBackgroundColor"]) { + NSString *colorString = themeConfig[@"selectedRowBackgroundColor"]; + UIColor *color = [self colorFromHexString:colorString]; + if (color) { + theme.selectedRowBackgroundColor = color; + } + } + + if (themeConfig[@"rowSeparatorColor"]) { + NSString *colorString = themeConfig[@"rowSeparatorColor"]; + UIColor *color = [self colorFromHexString:colorString]; + if (color) { + theme.rowSeparatorColor = color; + } + } + + // Set fonts + if (themeConfig[@"primaryFontPath"]) { + NSString *fontName = themeConfig[@"primaryFontPath"]; + NSString *fileName = [fontName lastPathComponent]; + NSString *nameWithoutExtension = [fileName stringByDeletingPathExtension]; + UIFont *font = [UIFont fontWithName:nameWithoutExtension size:17.0]; + if (font) { + theme.primaryTextFont = font; + } + } + + if (themeConfig[@"secondaryFontPath"]) { + NSString *fontName = themeConfig[@"secondaryFontPath"]; + NSString *fileName = [fontName lastPathComponent]; + NSString *nameWithoutExtension = [fileName stringByDeletingPathExtension]; + UIFont *font = [UIFont fontWithName:nameWithoutExtension size:17.0]; + if (font) { + theme.secondaryTextFont = font; + } + } + + if (themeConfig[@"ctaFontPath"]) { + NSString *fontName = themeConfig[@"ctaFontPath"]; + NSString *fileName = [fontName lastPathComponent]; + NSString *nameWithoutExtension = [fileName stringByDeletingPathExtension]; + UIFont *font = [UIFont fontWithName:nameWithoutExtension size:17.0]; + if (font) { + theme.callToActionTextFont = font; + } + } + + Instabug.theme = theme; +} + +- (UIColor *)colorFromHexString:(NSString *)hexString { + NSString *cleanString = [hexString stringByReplacingOccurrencesOfString:@"#" withString:@""]; + + if (cleanString.length == 6) { + unsigned int rgbValue = 0; + NSScanner *scanner = [NSScanner scannerWithString:cleanString]; + [scanner scanHexInt:&rgbValue]; + + return [UIColor colorWithRed:((rgbValue & 0xFF0000) >> 16) / 255.0 + green:((rgbValue & 0xFF00) >> 8) / 255.0 + blue:(rgbValue & 0xFF) / 255.0 + alpha:1.0]; + } else if (cleanString.length == 8) { + unsigned int rgbaValue = 0; + NSScanner *scanner = [NSScanner scannerWithString:cleanString]; + [scanner scanHexInt:&rgbaValue]; + + return [UIColor colorWithRed:((rgbaValue & 0xFF000000) >> 24) / 255.0 + green:((rgbaValue & 0xFF0000) >> 16) / 255.0 + blue:((rgbaValue & 0xFF00) >> 8) / 255.0 + alpha:(rgbaValue & 0xFF) / 255.0]; + } + + return [UIColor blackColor]; +} + + + RCT_EXPORT_METHOD(appendTags:(NSArray *)tags) { [Instabug appendTags:tags]; } diff --git a/src/index.ts b/src/index.ts index 6e7de0284..82628c48b 100644 --- a/src/index.ts +++ b/src/index.ts @@ -2,6 +2,7 @@ import type { InstabugConfig } from './models/InstabugConfig'; import Report from './models/Report'; import Trace from './models/Trace'; +import type { ThemeConfig } from './models/ThemeConfig'; // Modules import * as APM from './modules/APM'; import * as BugReporting from './modules/BugReporting'; @@ -29,6 +30,13 @@ export { Replies, Surveys, }; -export type { InstabugConfig, Survey, NetworkData, NetworkDataObfuscationHandler, SessionMetadata }; +export type { + InstabugConfig, + Survey, + NetworkData, + NetworkDataObfuscationHandler, + SessionMetadata, + ThemeConfig, +}; export default Instabug; diff --git a/src/models/ThemeConfig.ts b/src/models/ThemeConfig.ts new file mode 100644 index 000000000..fb90347c9 --- /dev/null +++ b/src/models/ThemeConfig.ts @@ -0,0 +1,34 @@ +export type ThemeConfig = { + // Colors + primaryColor?: string; + backgroundColor?: string; + titleTextColor?: string; + subtitleTextColor?: string; + primaryTextColor?: string; + secondaryTextColor?: string; + callToActionTextColor?: string; + headerBackgroundColor?: string; + footerBackgroundColor?: string; + rowBackgroundColor?: string; + selectedRowBackgroundColor?: string; + rowSeparatorColor?: string; + + // Text Styles (Android only) + primaryTextStyle?: 'bold' | 'italic' | 'normal'; + secondaryTextStyle?: 'bold' | 'italic' | 'normal'; + titleTextStyle?: 'bold' | 'italic' | 'normal'; + ctaTextStyle?: 'bold' | 'italic' | 'normal'; + + // Fonts + primaryFontPath?: string; + primaryFontAsset?: string; + secondaryFontPath?: string; + secondaryFontAsset?: string; + ctaFontPath?: string; + ctaFontAsset?: string; + + // Legacy properties (deprecated) + primaryTextType?: string; + secondaryTextType?: string; + ctaTextType?: string; +}; diff --git a/src/modules/Instabug.ts b/src/modules/Instabug.ts index f7d582e70..f5943e348 100644 --- a/src/modules/Instabug.ts +++ b/src/modules/Instabug.ts @@ -42,6 +42,7 @@ import { NativeNetworkLogger } from '../native/NativeNetworkLogger'; import InstabugConstants from '../utils/InstabugConstants'; import { InstabugRNConfig } from '../utils/config'; import { Logger } from '../utils/logger'; +import type { ThemeConfig } from '../models/ThemeConfig'; let _currentScreen: string | null = null; let _lastScreen: string | null = null; @@ -895,3 +896,50 @@ export const _registerFeatureFlagsChangeListener = ( export const enableAutoMasking = (autoMaskingTypes: AutoMaskingType[]) => { NativeInstabug.enableAutoMasking(autoMaskingTypes); }; + +/** + * Sets a custom theme for Instabug UI elements. + * + * This method provides comprehensive theming support. It will automatically use IBGTheme + * if available in the SDK version, otherwise falls back to individual theming methods. + * + * @param theme - Configuration object containing theme properties + * + * @example + * ```typescript + * // Basic usage with primary color (always supported) + * Instabug.setTheme({ + * primaryColor: '#FF6B6B' + * }); + * + * // Comprehensive theming (uses IBGTheme when available) + * Instabug.setTheme({ + * primaryColor: '#FF6B6B', + * secondaryTextColor: '#666666', + * primaryTextColor: '#333333', + * titleTextColor: '#000000', + * backgroundColor: '#FFFFFF', + * primaryTextStyle: 'bold', + * secondaryTextStyle: 'normal', + * titleTextStyle: 'bold', + * ctaTextStyle: 'bold', + * primaryFontPath: '/data/user/0/com.yourapp/files/fonts/YourFont.ttf', + * secondaryFontPath: '/data/user/0/com.yourapp/files/fonts/YourFont.ttf', + * ctaTextType: '/data/user/0/com.yourapp/files/fonts/YourFont.ttf', + * primaryFontAsset: 'fonts/YourFont.ttf', + * secondaryFontAsset: 'fonts/YourFont.ttf' + * }); + * ``` + */ +export const setTheme = (theme: ThemeConfig) => { + NativeInstabug.setTheme(theme); +}; +/** + * Enables or disables displaying in full-screen mode, hiding the status and navigation bars. + * @param isEnabled A boolean to enable/disable setFullscreen. + */ +export const setFullscreen = (isEnabled: boolean) => { + if (Platform.OS === 'android') { + NativeInstabug.setFullscreen(isEnabled); + } +}; diff --git a/src/native/NativeInstabug.ts b/src/native/NativeInstabug.ts index 7032bbc07..70c6ae42c 100644 --- a/src/native/NativeInstabug.ts +++ b/src/native/NativeInstabug.ts @@ -14,6 +14,7 @@ import type { import type { NativeConstants } from './NativeConstants'; import type { W3cExternalTraceAttributes } from '../models/W3cExternalTraceAttributes'; import { NativeModules } from './NativePackage'; +import type { ThemeConfig } from '../models/ThemeConfig'; export interface InstabugNativeModule extends NativeModule { getConstants(): NativeConstants; @@ -158,9 +159,12 @@ export interface InstabugNativeModule extends NativeModule { setOnFeaturesUpdatedListener(handler?: (params: any) => void): void; // android only enableAutoMasking(autoMaskingTypes: AutoMaskingType[]): void; getNetworkBodyMaxSize(): Promise; + + setTheme(theme: ThemeConfig): void; + setFullscreen(isEnabled: boolean): void; } -export const NativeInstabug = NativeModules.Instabug; +export const NativeInstabug = NativeModules.Instabug as InstabugNativeModule; export enum NativeEvents { PRESENDING_HANDLER = 'IBGpreSendingHandler', From 1f8a8bedc122aaa795e96f7c654534631cceaac5 Mon Sep 17 00:00:00 2001 From: AyaMahmoud148 Date: Mon, 7 Jul 2025 13:26:14 +0300 Subject: [PATCH 02/26] fix: lint --- .../reactlibrary/RNInstabugReactnativeModuleTest.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/android/src/test/java/com/instabug/reactlibrary/RNInstabugReactnativeModuleTest.java b/android/src/test/java/com/instabug/reactlibrary/RNInstabugReactnativeModuleTest.java index 072e33e7a..3694337ab 100644 --- a/android/src/test/java/com/instabug/reactlibrary/RNInstabugReactnativeModuleTest.java +++ b/android/src/test/java/com/instabug/reactlibrary/RNInstabugReactnativeModuleTest.java @@ -741,9 +741,7 @@ public void testSetTheme() { themeConfig.putString("primaryTextStyle", "bold"); themeConfig.putString("secondaryTextStyle", "italic"); themeConfig.putString("ctaTextStyle", "bold"); - themeConfig.putString("primaryFontPath", "TestFont.ttf"); - themeConfig.putString("secondaryFontPath", "fonts/AnotherFont.ttf"); - themeConfig.putString("ctaFontPath", "./assets/fonts/CTAFont.ttf"); + // Note: Not including font paths to avoid getReactApplicationContext() call in test // Mock IBGTheme.Builder com.instabug.library.model.IBGTheme.Builder mockBuilder = mock(com.instabug.library.model.IBGTheme.Builder.class); From 79b5c701814aa0b89ba0a478fe05a008c98c5494 Mon Sep 17 00:00:00 2001 From: AyaMahmoud148 Date: Mon, 7 Jul 2025 13:30:30 +0300 Subject: [PATCH 03/26] fix android test --- .../instabug/reactlibrary/RNInstabugReactnativeModuleTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/android/src/test/java/com/instabug/reactlibrary/RNInstabugReactnativeModuleTest.java b/android/src/test/java/com/instabug/reactlibrary/RNInstabugReactnativeModuleTest.java index 3694337ab..af67213dd 100644 --- a/android/src/test/java/com/instabug/reactlibrary/RNInstabugReactnativeModuleTest.java +++ b/android/src/test/java/com/instabug/reactlibrary/RNInstabugReactnativeModuleTest.java @@ -741,7 +741,6 @@ public void testSetTheme() { themeConfig.putString("primaryTextStyle", "bold"); themeConfig.putString("secondaryTextStyle", "italic"); themeConfig.putString("ctaTextStyle", "bold"); - // Note: Not including font paths to avoid getReactApplicationContext() call in test // Mock IBGTheme.Builder com.instabug.library.model.IBGTheme.Builder mockBuilder = mock(com.instabug.library.model.IBGTheme.Builder.class); From 6d3ef3f1636585785f96403d247134aa007fbd46 Mon Sep 17 00:00:00 2001 From: AyaMahmoud148 Date: Mon, 7 Jul 2025 13:34:17 +0300 Subject: [PATCH 04/26] fix: add changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index abda7ed70..0578ee431 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## [Unreleased](https://github.com/Instabug/Instabug-React-Native/compare/v15.0.1...dev) + +### Added + +- Add Support Advanced UI customization. ([#1411](https://github.com/Instabug/Instabug-React-Native/pull/1411)) + ## [15.0.1](https://github.com/Instabug/Instabug-React-Native/compare/v14.3.0...v15.0.1) ### Added From c5409f04010e196226a0be10d56243dc4bbeca05 Mon Sep 17 00:00:00 2001 From: AyaMahmoud148 Date: Mon, 7 Jul 2025 13:54:37 +0300 Subject: [PATCH 05/26] fix: mocking file --- test/mocks/mockInstabug.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/mocks/mockInstabug.ts b/test/mocks/mockInstabug.ts index 391a00a38..60c4b9ade 100644 --- a/test/mocks/mockInstabug.ts +++ b/test/mocks/mockInstabug.ts @@ -77,6 +77,8 @@ const mockInstabug: InstabugNativeModule = { setOnFeaturesUpdatedListener: jest.fn(), enableAutoMasking: jest.fn(), getNetworkBodyMaxSize: jest.fn().mockResolvedValue(10240), // 10 KB + setTheme: jest.fn(), + setFullscreen: jest.fn(), }; export default mockInstabug; From c828d0a27928b267c7a29374e3c64deaefdc67ee Mon Sep 17 00:00:00 2001 From: AyaMahmoud148 Date: Wed, 9 Jul 2025 13:55:13 +0300 Subject: [PATCH 06/26] fix: refactor redundant code --- .../RNInstabugReactnativeModule.java | 60 ++++--- ios/RNInstabug/InstabugReactBridge.m | 156 +++++------------- 2 files changed, 72 insertions(+), 144 deletions(-) diff --git a/android/src/main/java/com/instabug/reactlibrary/RNInstabugReactnativeModule.java b/android/src/main/java/com/instabug/reactlibrary/RNInstabugReactnativeModule.java index 7147b856c..3d1e744fc 100644 --- a/android/src/main/java/com/instabug/reactlibrary/RNInstabugReactnativeModule.java +++ b/android/src/main/java/com/instabug/reactlibrary/RNInstabugReactnativeModule.java @@ -1394,32 +1394,9 @@ public void run() { if (themeConfig.hasKey("ctaTextStyle")) { builder.setCtaTextStyle(getTextStyle(themeConfig, "ctaTextStyle")); } - if (themeConfig.hasKey("primaryFontPath") || themeConfig.hasKey("primaryFontAsset")) { - Typeface primaryTypeface = getTypeface(themeConfig, "primaryFontPath", "primaryFontAsset"); - if (primaryTypeface != null) { - builder.setPrimaryTextFont(primaryTypeface); - } else { - Log.e("InstabugModule", "Failed to load primary font"); - } - } - - if (themeConfig.hasKey("secondaryFontPath") || themeConfig.hasKey("secondaryFontAsset")) { - Typeface secondaryTypeface = getTypeface(themeConfig, "secondaryFontPath", "secondaryFontAsset"); - if (secondaryTypeface != null) { - builder.setSecondaryTextFont(secondaryTypeface); - } else { - Log.e("InstabugModule", "Failed to load secondary font"); - } - } - - if (themeConfig.hasKey("ctaFontPath") || themeConfig.hasKey("ctaFontAsset")) { - Typeface ctaTypeface = getTypeface(themeConfig, "ctaFontPath", "ctaFontAsset"); - if (ctaTypeface != null) { - builder.setCtaTextFont(ctaTypeface); - } else { - Log.e("InstabugModule", "Failed to load CTA font"); - } - } + setFontIfPresent(themeConfig, builder, "primaryFontPath", "primaryFontAsset", "primary"); + setFontIfPresent(themeConfig, builder, "secondaryFontPath", "secondaryFontAsset", "secondary"); + setFontIfPresent(themeConfig, builder, "ctaFontPath", "ctaFontAsset", "CTA"); IBGTheme theme = builder.build(); Instabug.setTheme(theme); @@ -1479,6 +1456,37 @@ private int getTextStyle(ReadableMap map, String key) { return Typeface.NORMAL; } + /** + * 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 + * @param assetKey The key for font asset path + * @param fontType The type of font (for logging purposes) + */ + private void setFontIfPresent(ReadableMap themeConfig, com.instabug.library.model.IBGTheme.Builder builder, + String fileKey, String assetKey, String fontType) { + if (themeConfig.hasKey(fileKey) || themeConfig.hasKey(assetKey)) { + Typeface typeface = getTypeface(themeConfig, fileKey, assetKey); + if (typeface != null) { + switch (fontType) { + case "primary": + builder.setPrimaryTextFont(typeface); + break; + case "secondary": + builder.setSecondaryTextFont(typeface); + break; + case "CTA": + builder.setCtaTextFont(typeface); + break; + } + } else { + Log.e("InstabugModule", "Failed to load " + fontType + " font"); + } + } + } + private Typeface getTypeface(ReadableMap map, String fileKey, String assetKey) { try { if (fileKey != null && map.hasKey(fileKey) && !map.isNull(fileKey)) { diff --git a/ios/RNInstabug/InstabugReactBridge.m b/ios/RNInstabug/InstabugReactBridge.m index a7efd17ba..794c3b6f2 100644 --- a/ios/RNInstabug/InstabugReactBridge.m +++ b/ios/RNInstabug/InstabugReactBridge.m @@ -176,134 +176,54 @@ - (dispatch_queue_t)methodQueue { RCT_EXPORT_METHOD(setTheme:(NSDictionary *)themeConfig) { IBGTheme *theme = [[IBGTheme alloc] init]; - if (themeConfig[@"primaryColor"]) { - NSString *colorString = themeConfig[@"primaryColor"]; - UIColor *color = [self colorFromHexString:colorString]; - if (color) { - theme.primaryColor = color; - } - } - - if (themeConfig[@"backgroundColor"]) { - NSString *colorString = themeConfig[@"backgroundColor"]; - UIColor *color = [self colorFromHexString:colorString]; - if (color) { - theme.backgroundColor = color; - } - } - - if (themeConfig[@"titleTextColor"]) { - NSString *colorString = themeConfig[@"titleTextColor"]; - UIColor *color = [self colorFromHexString:colorString]; - if (color) { - theme.titleTextColor = color; - } - } - - if (themeConfig[@"subtitleTextColor"]) { - NSString *colorString = themeConfig[@"subtitleTextColor"]; - UIColor *color = [self colorFromHexString:colorString]; - if (color) { - theme.subtitleTextColor = color; - } - } - - if (themeConfig[@"primaryTextColor"]) { - NSString *colorString = themeConfig[@"primaryTextColor"]; - UIColor *color = [self colorFromHexString:colorString]; - if (color) { - theme.primaryTextColor = color; - } - } - - if (themeConfig[@"secondaryTextColor"]) { - NSString *colorString = themeConfig[@"secondaryTextColor"]; - UIColor *color = [self colorFromHexString:colorString]; - if (color) { - theme.secondaryTextColor = color; - } - } - - if (themeConfig[@"callToActionTextColor"]) { - NSString *colorString = themeConfig[@"callToActionTextColor"]; - UIColor *color = [self colorFromHexString:colorString]; - if (color) { - theme.callToActionTextColor = color; - } - } - - if (themeConfig[@"headerBackgroundColor"]) { - NSString *colorString = themeConfig[@"headerBackgroundColor"]; - UIColor *color = [self colorFromHexString:colorString]; - if (color) { - theme.headerBackgroundColor = color; - } - } - - if (themeConfig[@"footerBackgroundColor"]) { - NSString *colorString = themeConfig[@"footerBackgroundColor"]; - UIColor *color = [self colorFromHexString:colorString]; - if (color) { - theme.footerBackgroundColor = color; - } - } - - if (themeConfig[@"rowBackgroundColor"]) { - NSString *colorString = themeConfig[@"rowBackgroundColor"]; - UIColor *color = [self colorFromHexString:colorString]; - if (color) { - theme.rowBackgroundColor = color; - } - } - - if (themeConfig[@"selectedRowBackgroundColor"]) { - NSString *colorString = themeConfig[@"selectedRowBackgroundColor"]; - UIColor *color = [self colorFromHexString:colorString]; - if (color) { - theme.selectedRowBackgroundColor = color; - } - } - - if (themeConfig[@"rowSeparatorColor"]) { - NSString *colorString = themeConfig[@"rowSeparatorColor"]; - UIColor *color = [self colorFromHexString:colorString]; - if (color) { - theme.rowSeparatorColor = color; - } - } + NSDictionary *colorMapping = @{ + @"primaryColor": ^(UIColor *color) { theme.primaryColor = color; }, + @"backgroundColor": ^(UIColor *color) { theme.backgroundColor = color; }, + @"titleTextColor": ^(UIColor *color) { theme.titleTextColor = color; }, + @"subtitleTextColor": ^(UIColor *color) { theme.subtitleTextColor = color; }, + @"primaryTextColor": ^(UIColor *color) { theme.primaryTextColor = color; }, + @"secondaryTextColor": ^(UIColor *color) { theme.secondaryTextColor = color; }, + @"callToActionTextColor": ^(UIColor *color) { theme.callToActionTextColor = color; }, + @"headerBackgroundColor": ^(UIColor *color) { theme.headerBackgroundColor = color; }, + @"footerBackgroundColor": ^(UIColor *color) { theme.footerBackgroundColor = color; }, + @"rowBackgroundColor": ^(UIColor *color) { theme.rowBackgroundColor = color; }, + @"selectedRowBackgroundColor": ^(UIColor *color) { theme.selectedRowBackgroundColor = color; }, + @"rowSeparatorColor": ^(UIColor *color) { theme.rowSeparatorColor = color; } + }; - // Set fonts - if (themeConfig[@"primaryFontPath"]) { - NSString *fontName = themeConfig[@"primaryFontPath"]; - NSString *fileName = [fontName lastPathComponent]; - NSString *nameWithoutExtension = [fileName stringByDeletingPathExtension]; - UIFont *font = [UIFont fontWithName:nameWithoutExtension size:17.0]; - if (font) { - theme.primaryTextFont = font; + for (NSString *key in colorMapping) { + if (themeConfig[key]) { + NSString *colorString = themeConfig[key]; + UIColor *color = [self colorFromHexString:colorString]; + if (color) { + void (^setter)(UIColor *) = colorMapping[key]; + setter(color); + } } } - if (themeConfig[@"secondaryFontPath"]) { - NSString *fontName = themeConfig[@"secondaryFontPath"]; - NSString *fileName = [fontName lastPathComponent]; - NSString *nameWithoutExtension = [fileName stringByDeletingPathExtension]; - UIFont *font = [UIFont fontWithName:nameWithoutExtension size:17.0]; - if (font) { - theme.secondaryTextFont = font; - } - } + [self setFontIfPresent:themeConfig[@"primaryFontPath"] forTheme:theme type:@"primary"]; + [self setFontIfPresent:themeConfig[@"secondaryFontPath"] forTheme:theme type:@"secondary"]; + [self setFontIfPresent:themeConfig[@"ctaFontPath"] forTheme:theme type:@"cta"]; - if (themeConfig[@"ctaFontPath"]) { - NSString *fontName = themeConfig[@"ctaFontPath"]; - NSString *fileName = [fontName lastPathComponent]; + Instabug.theme = theme; +} + +- (void)setFontIfPresent:(NSString *)fontPath forTheme:(IBGTheme *)theme type:(NSString *)type { + if (fontPath) { + NSString *fileName = [fontPath lastPathComponent]; NSString *nameWithoutExtension = [fileName stringByDeletingPathExtension]; UIFont *font = [UIFont fontWithName:nameWithoutExtension size:17.0]; if (font) { - theme.callToActionTextFont = font; + if ([type isEqualToString:@"primary"]) { + theme.primaryTextFont = font; + } else if ([type isEqualToString:@"secondary"]) { + theme.secondaryTextFont = font; + } else if ([type isEqualToString:@"cta"]) { + theme.callToActionTextFont = font; + } } } - - Instabug.theme = theme; } - (UIColor *)colorFromHexString:(NSString *)hexString { From 4214a27127db0fa45e3feb235b54ae5c1e616af1 Mon Sep 17 00:00:00 2001 From: AyaMahmoud148 Date: Mon, 14 Jul 2025 14:31:28 +0300 Subject: [PATCH 07/26] fix: refactor functions --- .../RNInstabugReactnativeModule.java | 158 +++++++++++------- 1 file changed, 101 insertions(+), 57 deletions(-) diff --git a/android/src/main/java/com/instabug/reactlibrary/RNInstabugReactnativeModule.java b/android/src/main/java/com/instabug/reactlibrary/RNInstabugReactnativeModule.java index 3d1e744fc..fa9d6cee7 100644 --- a/android/src/main/java/com/instabug/reactlibrary/RNInstabugReactnativeModule.java +++ b/android/src/main/java/com/instabug/reactlibrary/RNInstabugReactnativeModule.java @@ -1369,31 +1369,17 @@ public void run() { try { com.instabug.library.model.IBGTheme.Builder builder = new com.instabug.library.model.IBGTheme.Builder(); - if (themeConfig.hasKey("primaryColor")) { - builder.setPrimaryColor(getColor(themeConfig, "primaryColor")); - } - if (themeConfig.hasKey("secondaryTextColor")) { - builder.setSecondaryTextColor(getColor(themeConfig, "secondaryTextColor")); - } - if (themeConfig.hasKey("primaryTextColor")) { - builder.setPrimaryTextColor(getColor(themeConfig, "primaryTextColor")); - } - if (themeConfig.hasKey("titleTextColor")) { - builder.setTitleTextColor(getColor(themeConfig, "titleTextColor")); - } - if (themeConfig.hasKey("backgroundColor")) { - builder.setBackgroundColor(getColor(themeConfig, "backgroundColor")); - } - - if (themeConfig.hasKey("primaryTextStyle")) { - builder.setPrimaryTextStyle(getTextStyle(themeConfig, "primaryTextStyle")); - } - if (themeConfig.hasKey("secondaryTextStyle")) { - builder.setSecondaryTextStyle(getTextStyle(themeConfig, "secondaryTextStyle")); - } - if (themeConfig.hasKey("ctaTextStyle")) { - builder.setCtaTextStyle(getTextStyle(themeConfig, "ctaTextStyle")); - } + // Apply colors + applyColorIfPresent(themeConfig, builder, "primaryColor", (b, color) -> b.setPrimaryColor(color)); + applyColorIfPresent(themeConfig, builder, "secondaryTextColor", (b, color) -> b.setSecondaryTextColor(color)); + applyColorIfPresent(themeConfig, builder, "primaryTextColor", (b, color) -> b.setPrimaryTextColor(color)); + applyColorIfPresent(themeConfig, builder, "titleTextColor", (b, color) -> b.setTitleTextColor(color)); + applyColorIfPresent(themeConfig, builder, "backgroundColor", (b, color) -> b.setBackgroundColor(color)); + + // Apply text styles + applyTextStyleIfPresent(themeConfig, builder, "primaryTextStyle", (b, style) -> b.setPrimaryTextStyle(style)); + applyTextStyleIfPresent(themeConfig, builder, "secondaryTextStyle", (b, style) -> b.setSecondaryTextStyle(style)); + applyTextStyleIfPresent(themeConfig, builder, "ctaTextStyle", (b, style) -> b.setCtaTextStyle(style)); setFontIfPresent(themeConfig, builder, "primaryFontPath", "primaryFontAsset", "primary"); setFontIfPresent(themeConfig, builder, "secondaryFontPath", "secondaryFontAsset", "secondary"); setFontIfPresent(themeConfig, builder, "ctaFontPath", "ctaFontAsset", "CTA"); @@ -1456,6 +1442,40 @@ private int getTextStyle(ReadableMap map, String key) { return Typeface.NORMAL; } + + + /** + * Applies a color to the theme builder if present in the configuration. + * + * @param themeConfig The theme configuration map + * @param builder The theme builder + * @param key The configuration key + * @param setter The color setter function + */ + private void applyColorIfPresent(ReadableMap themeConfig, com.instabug.library.model.IBGTheme.Builder builder, + String key, java.util.function.BiConsumer setter) { + if (themeConfig.hasKey(key)) { + int color = getColor(themeConfig, key); + setter.accept(builder, color); + } + } + + /** + * Applies a text style to the theme builder if present in the configuration. + * + * @param themeConfig The theme configuration map + * @param builder The theme builder + * @param key The configuration key + * @param setter The text style setter function + */ + private void applyTextStyleIfPresent(ReadableMap themeConfig, com.instabug.library.model.IBGTheme.Builder builder, + String key, java.util.function.BiConsumer setter) { + if (themeConfig.hasKey(key)) { + int style = getTextStyle(themeConfig, key); + setter.accept(builder, style); + } + } + /** * Sets a font on the theme builder if the font configuration is present in the theme config. * @@ -1487,45 +1507,69 @@ private void setFontIfPresent(ReadableMap themeConfig, com.instabug.library.mode } } -private Typeface getTypeface(ReadableMap map, String fileKey, String assetKey) { - try { - if (fileKey != null && map.hasKey(fileKey) && !map.isNull(fileKey)) { - String fontPath = map.getString(fileKey); - String fileName = getFileName(fontPath); - - try { - Typeface typeface = Typeface.create(fileName, Typeface.NORMAL); - if (typeface != null && !typeface.equals(Typeface.DEFAULT)) { - return typeface; - } - } catch (Exception e) { - e.printStackTrace(); - } - - try { - Typeface typeface = Typeface.createFromAsset(getReactApplicationContext().getAssets(), "fonts/" + fileName); + /** + * Loads a Typeface from a file path. + * + * @param fileName The filename to load + * @return The loaded Typeface or null if failed + */ + private Typeface loadTypefaceFromFile(String fileName) { + try { + Typeface typeface = Typeface.create(fileName, Typeface.NORMAL); + if (typeface != null && !typeface.equals(Typeface.DEFAULT)) { return typeface; - } catch (Exception e) { - e.printStackTrace(); } + } catch (Exception e) { + e.printStackTrace(); } + return null; + } - if (assetKey != null && map.hasKey(assetKey) && !map.isNull(assetKey)) { - String assetPath = map.getString(assetKey); - String fileName = getFileName(assetPath); - try { - Typeface typeface = Typeface.createFromAsset(getReactApplicationContext().getAssets(), "fonts/" + fileName); - return typeface; - } catch (Exception e) { - e.printStackTrace(); - } + /** + * Loads a Typeface from assets. + * + * @param fileName The filename in assets/fonts/ directory + * @return The loaded Typeface or null if failed + */ + private Typeface loadTypefaceFromAssets(String fileName) { + try { + return Typeface.createFromAsset(getReactApplicationContext().getAssets(), "fonts/" + fileName); + } catch (Exception e) { + e.printStackTrace(); + return null; } - } catch (Exception e) { - e.printStackTrace(); } - return Typeface.DEFAULT; -} + private Typeface getTypeface(ReadableMap map, String fileKey, String assetKey) { + try { + if (fileKey != null && map.hasKey(fileKey) && !map.isNull(fileKey)) { + String fontPath = map.getString(fileKey); + String fileName = getFileName(fontPath); + + // Try loading from file first + Typeface typeface = loadTypefaceFromFile(fileName); + if (typeface != null) { + return typeface; + } + + // Try loading from assets + typeface = loadTypefaceFromAssets(fileName); + if (typeface != null) { + return typeface; + } + } + + if (assetKey != null && map.hasKey(assetKey) && !map.isNull(assetKey)) { + String assetPath = map.getString(assetKey); + String fileName = getFileName(assetPath); + return loadTypefaceFromAssets(fileName); + } + } catch (Exception e) { + e.printStackTrace(); + } + + return Typeface.DEFAULT; + } /** * Extracts the filename from a path, removing any directory prefixes. From dafc63d097ebf4bcc0b08e7ec79b98284faef1c8 Mon Sep 17 00:00:00 2001 From: AyaMahmoud148 Date: Sun, 20 Jul 2025 13:02:02 +0300 Subject: [PATCH 08/26] chore: add readme file for UI customization --- FONTS_SETUP_GUIDE.md | 484 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 484 insertions(+) create mode 100644 FONTS_SETUP_GUIDE.md diff --git a/FONTS_SETUP_GUIDE.md b/FONTS_SETUP_GUIDE.md new file mode 100644 index 000000000..16a0230f4 --- /dev/null +++ b/FONTS_SETUP_GUIDE.md @@ -0,0 +1,484 @@ +# Complete Font Setup Guide for Instabug React Native + +This guide covers all ways to use fonts with the `setTheme` function in Instabug React Native, including Google Fonts, custom fonts, system fonts, and both Expo and regular React Native projects. + +## Table of Contents + +1. [Overview](#overview) +2. [Font Types Supported](#font-types-supported) +3. [Regular React Native Setup](#regular-react-native-setup) +4. [Expo Setup](#expo-setup) +5. [Asset Linking Options](#asset-linking-options) +6. [Usage Examples](#usage-examples) +7. [Troubleshooting](#troubleshooting) +8. [Platform Compatibility Notes](#platform-compatibility-notes) + +## Overview + +The Instabug React Native bridge supports font loading from multiple sources: +- **App Bundle**: Fonts included in your app assets +- **System Fonts**: Built-in platform fonts +- **Custom Fonts**: Any TTF/OTF font files +- **Google Fonts**: Downloaded TTF files from Google Fonts + +## Font Types Supported + +### 1. Google Fonts +- Download TTF files from [Google Fonts](https://fonts.google.com/) +- Examples: Roboto, Inter, Nunito, Open Sans, Lato + +### 2. Custom Fonts +- Any TTF/OTF font files +- Commercial fonts, free fonts, custom designs + +### 3. System Fonts +- Platform default fonts +- No setup required +- Examples: San Francisco (iOS), Roboto (Android) + +## Regular React Native Setup + +### Method 1: Bundle Fonts (Recommended) + +#### Step 1: Download Font Files +```bash +# Create fonts directory +mkdir fonts + +# Download your desired fonts (example with Google Fonts) +# Download from Google Fonts or any font provider +# Place TTF files in the fonts directory +``` + +#### Step 2: Add to Android +```bash +# Create assets/fonts directory +mkdir -p android/app/src/main/assets/fonts + +# Copy font files +cp fonts/*.ttf android/app/src/main/assets/fonts/ +``` + +#### Step 3: Add to iOS +1. **Add to Xcode Project:** + - Open your iOS project in Xcode + - Right-click on your project → "Add Files to [ProjectName]" + - Select your TTF files + - Make sure "Add to target" is checked + +2. **Update Info.plist:** +```xml +UIAppFonts + + Roboto-Regular.ttf + Roboto-Bold.ttf + Inter-Regular.ttf + Inter-Bold.ttf + +``` + +#### Step 4: Use with setTheme +```typescript +import Instabug from 'instabug-reactnative'; +import { Platform } from 'react-native'; + +const applyCustomTheme = () => { + Instabug.setTheme({ + // Colors + primaryColor: '#2196F3', + backgroundColor: '#FFFFFF', + primaryTextColor: '#333333', + + // Text styles (Android only) + primaryTextStyle: 'normal', + secondaryTextStyle: 'normal', + ctaTextStyle: 'bold', + + // Fonts - Android (use font paths) + ...(Platform.OS === 'android' && { + primaryFontPath: '/data/user/0/com.yourapp/files/fonts/Roboto-Regular.ttf', + secondaryFontPath: '/data/user/0/com.yourapp/files/fonts/Roboto-Light.ttf', + ctaFontPath: '/data/user/0/com.yourapp/files/fonts/Roboto-Bold.ttf', + }), + + // Fonts - iOS (use font paths, not assets) + ...(Platform.OS === 'ios' && { + primaryFontPath: 'fonts/Roboto-Regular.ttf', + secondaryFontPath: 'fonts/Roboto-Light.ttf', + ctaFontPath: 'fonts/Roboto-Bold.ttf', + }), + }); +}; +``` + +### Method 2: System Fonts Only +```typescript +import Instabug from 'instabug-reactnative'; + +const applySystemTheme = () => { + Instabug.setTheme({ + // Colors only - uses system fonts + primaryColor: '#2196F3', + backgroundColor: '#FFFFFF', + primaryTextColor: '#333333', + secondaryTextColor: '#666666', + titleTextColor: '#000000', + + // Text styles (Android only) + primaryTextStyle: 'normal', + secondaryTextStyle: 'normal', + ctaTextStyle: 'bold', + + // No font paths = uses system fonts + }); +}; +``` + +## Expo Setup + +### Method 1: Expo Fonts (Recommended for Expo) + +#### Step 1: Install Expo Fonts +```bash +npx expo install expo-font +``` + +#### Step 2: Download and Add Fonts +```bash +# Create fonts directory +mkdir fonts + +# Download your fonts and place them in the fonts directory +# Example: Roboto-Regular.ttf, Roboto-Bold.ttf, Inter-Regular.ttf +``` + +#### Step 3: Configure app.json +```json +{ + "expo": { + "fonts": [ + { + "asset": "./fonts/Roboto-Regular.ttf", + "family": "Roboto-Regular" + }, + { + "asset": "./fonts/Roboto-Bold.ttf", + "family": "Roboto-Bold" + }, + { + "asset": "./fonts/Inter-Regular.ttf", + "family": "Inter-Regular" + } + ] + } +} +``` + +#### Step 4: Load Fonts in Your App +```typescript +import * as Font from 'expo-font'; +import { useEffect, useState } from 'react'; + +export default function App() { + const [fontsLoaded, setFontsLoaded] = useState(false); + + useEffect(() => { + async function loadFonts() { + await Font.loadAsync({ + 'Roboto-Regular': require('./fonts/Roboto-Regular.ttf'), + 'Roboto-Bold': require('./fonts/Roboto-Bold.ttf'), + 'Inter-Regular': require('./fonts/Inter-Regular.ttf'), + }); + setFontsLoaded(true); + } + loadFonts(); + }, []); + + if (!fontsLoaded) { + return ; + } + + return ; +} +``` + +#### Step 5: Use with setTheme +```typescript +import Instabug from 'instabug-reactnative'; +import { Platform } from 'react-native'; + +const applyExpoTheme = () => { + Instabug.setTheme({ + // Colors + primaryColor: '#2196F3', + backgroundColor: '#FFFFFF', + primaryTextColor: '#333333', + + // Text styles (Android only) + primaryTextStyle: 'normal', + secondaryTextStyle: 'normal', + ctaTextStyle: 'bold', + + // Fonts - use font paths for both platforms + primaryFontPath: 'fonts/Roboto-Regular.ttf', + secondaryFontPath: 'fonts/Inter-Regular.ttf', + ctaFontPath: 'fonts/Roboto-Bold.ttf', + }); +}; +``` + +### Method 2: Expo with Bundle Fonts +Same as Regular React Native Method 1, but fonts are automatically included in the Expo build. + +## Asset Linking Options + +### Option 1: Manual Copy (Current Method) +- Copy TTF files to native directories +- Update Info.plist manually +- Works with all setups + +### Option 2: React Native CLI Linking +```bash +# Create a react-native.config.js file +module.exports = { + assets: ['./fonts/'], +}; +``` + +Then run: +```bash +npx react-native link +``` + +### Option 3: Expo Asset Linking +```json +{ + "expo": { + "fonts": [ + { + "asset": "./fonts/Roboto-Regular.ttf", + "family": "Roboto-Regular" + } + ] + } +} +``` + +### Option 4: Metro Asset Plugin +```bash +npm install --save-dev react-native-asset +``` + +Create `react-native.config.js`: +```javascript +module.exports = { + assets: ['./fonts/'], +}; +``` + +## Usage Examples + +### Example 1: Google Fonts (Roboto) +```typescript +// Download: Roboto-Regular.ttf, Roboto-Bold.ttf, Roboto-Light.ttf +// Add to project using any method above + +const applyRobotoTheme = () => { + Instabug.setTheme({ + primaryColor: '#1976D2', + backgroundColor: '#FAFAFA', + primaryTextColor: '#212121', + secondaryTextColor: '#757575', + titleTextColor: '#000000', + + // Text styles (Android only) + primaryTextStyle: 'normal', + secondaryTextStyle: 'normal', + ctaTextStyle: 'bold', + + // Font paths for both platforms + primaryFontPath: 'fonts/Roboto-Regular.ttf', + secondaryFontPath: 'fonts/Roboto-Light.ttf', + ctaFontPath: 'fonts/Roboto-Bold.ttf', + }); +}; +``` + +### Example 2: Custom Fonts (Inter) +```typescript +// Download: Inter-Regular.ttf, Inter-Bold.ttf, Inter-Medium.ttf +// Add to project using any method above + +const applyInterTheme = () => { + Instabug.setTheme({ + primaryColor: '#3B82F6', + backgroundColor: '#FFFFFF', + primaryTextColor: '#1F2937', + secondaryTextColor: '#6B7280', + titleTextColor: '#111827', + + // Text styles (Android only) + primaryTextStyle: 'normal', + secondaryTextStyle: 'normal', + ctaTextStyle: 'bold', + + // Font paths for both platforms + primaryFontPath: 'fonts/Inter-Regular.ttf', + secondaryFontPath: 'fonts/Inter-Medium.ttf', + ctaFontPath: 'fonts/Inter-Bold.ttf', + }); +}; +``` + +### Example 3: System Fonts Only +```typescript +const applySystemTheme = () => { + Instabug.setTheme({ + primaryColor: '#007AFF', + backgroundColor: '#F2F2F7', + primaryTextColor: '#000000', + secondaryTextColor: '#8E8E93', + titleTextColor: '#000000', + + // Text styles (Android only) - no font paths = uses system fonts + primaryTextStyle: 'normal', + secondaryTextStyle: 'normal', + ctaTextStyle: 'bold', + }); +}; +``` + +### Example 4: Mixed Approach +```typescript +const applyMixedTheme = () => { + Instabug.setTheme({ + primaryColor: '#FF6B6B', + backgroundColor: '#FFFFFF', + primaryTextColor: '#2D3436', + secondaryTextColor: '#636E72', + titleTextColor: '#2D3436', + + // Text styles (Android only) + primaryTextStyle: 'normal', + secondaryTextStyle: 'normal', + ctaTextStyle: 'bold', + + // Custom font only for CTA - rest use system fonts + ctaFontPath: 'fonts/Roboto-Bold.ttf', + }); +}; +``` + +## Platform Compatibility Notes + +### **Important: iOS Font Asset Limitation** + +The iOS implementation currently **only supports** `primaryFontPath`, `secondaryFontPath`, and `ctaFontPath` properties. The `*FontAsset` properties are **not supported** on iOS. + +**Android**: Supports both `*FontPath` and `*FontAsset` properties +**iOS**: Only supports `*FontPath` properties + +### **Recommended Approach** + +Use `*FontPath` properties for both platforms to ensure compatibility: + +```typescript +// ✅ Works on both platforms +Instabug.setTheme({ + primaryFontPath: 'fonts/Roboto-Regular.ttf', + secondaryFontPath: 'fonts/Roboto-Light.ttf', + ctaFontPath: 'fonts/Roboto-Bold.ttf', +}); + +// ❌ iOS doesn't support these +Instabug.setTheme({ + primaryFontAsset: 'fonts/Roboto-Regular.ttf', // iOS ignores this + secondaryFontAsset: 'fonts/Roboto-Light.ttf', // iOS ignores this + ctaFontAsset: 'fonts/Roboto-Bold.ttf', // iOS ignores this +}); +``` + +### **Font Path Format** + +- **Android**: Can use full paths or just filenames +- **iOS**: Use relative paths like `fonts/Roboto-Regular.ttf` + +## Troubleshooting + +### Common Issues + +#### 1. Font Not Loading +**Symptoms:** Font appears as system font or doesn't change +**Solutions:** +- Check font filename matches exactly (case-sensitive) +- Verify font is added to both Android and iOS +- For iOS, check Info.plist entries +- For Expo, ensure fonts are loaded before using setTheme +- **iOS users**: Make sure you're using `*FontPath` properties, not `*FontAsset` + +#### 2. Font Loading in Expo +**Symptoms:** Font works in development but not in production +**Solutions:** +- Use `expo-font` to load fonts before app starts +- Ensure fonts are included in app.json +- Test with `expo build` or EAS Build + +#### 3. Font File Issues +**Symptoms:** App crashes or font doesn't load +**Solutions:** +- Verify TTF file is not corrupted +- Check file size (should be reasonable, not 0 bytes) +- Ensure font file is valid TTF/OTF format + +#### 4. Performance Issues +**Symptoms:** App slow to start or font loading delays +**Solutions:** +- Use system fonts for better performance +- Limit number of custom fonts +- Preload fonts in app initialization + +### Debug Steps + +1. **Check Font Loading:** +```typescript +// Add this to debug font loading +console.log('Available fonts:', Instabug.getAvailableFonts()); // If available +``` + +2. **Verify File Paths:** +```bash +# Check if fonts are in the right place +ls -la android/app/src/main/assets/fonts/ +ls -la ios/YourApp/ +``` + +3. **Test with System Fonts First:** +```typescript +// Test with system fonts to ensure setTheme works +Instabug.setTheme({ + primaryColor: '#FF0000', + // No fontFamily = system fonts +}); +``` + +## Best Practices + +1. **Use System Fonts When Possible:** Better performance and consistency +2. **Limit Custom Fonts:** Use 1-2 custom fonts maximum +3. **Preload Fonts:** Load fonts before app starts +4. **Test on Both Platforms:** Fonts may behave differently on iOS vs Android +5. **Use Standard Font Weights:** Regular, Bold, Light are most reliable +6. **Keep Font Files Small:** Optimize TTF files for mobile +7. **Use *FontPath Properties:** Ensures compatibility with both platforms + +## Summary + +- **Regular React Native:** Use bundle fonts or system fonts +- **Expo:** Use expo-font or bundle fonts +- **Asset Linking:** Available through CLI tools and Expo config +- **Google Fonts:** Download TTF files and add to project +- **Custom Fonts:** Any TTF/OTF file works the same way +- **System Fonts:** No setup required, best performance +- **Platform Compatibility:** Use `*FontPath` properties for both platforms + +The native bridge handles all font loading automatically once fonts are properly added to your project! \ No newline at end of file From c3a5b9792590037e701ba7d103f989dffe4ad0f1 Mon Sep 17 00:00:00 2001 From: AyaMahmoud148 Date: Sun, 20 Jul 2025 13:05:18 +0300 Subject: [PATCH 09/26] fix: lint --- FONTS_SETUP_GUIDE.md | 70 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 54 insertions(+), 16 deletions(-) diff --git a/FONTS_SETUP_GUIDE.md b/FONTS_SETUP_GUIDE.md index 16a0230f4..5c0c6c903 100644 --- a/FONTS_SETUP_GUIDE.md +++ b/FONTS_SETUP_GUIDE.md @@ -16,6 +16,7 @@ This guide covers all ways to use fonts with the `setTheme` function in Instabug ## Overview The Instabug React Native bridge supports font loading from multiple sources: + - **App Bundle**: Fonts included in your app assets - **System Fonts**: Built-in platform fonts - **Custom Fonts**: Any TTF/OTF font files @@ -24,14 +25,17 @@ The Instabug React Native bridge supports font loading from multiple sources: ## Font Types Supported ### 1. Google Fonts + - Download TTF files from [Google Fonts](https://fonts.google.com/) - Examples: Roboto, Inter, Nunito, Open Sans, Lato ### 2. Custom Fonts + - Any TTF/OTF font files - Commercial fonts, free fonts, custom designs ### 3. System Fonts + - Platform default fonts - No setup required - Examples: San Francisco (iOS), Roboto (Android) @@ -41,6 +45,7 @@ The Instabug React Native bridge supports font loading from multiple sources: ### Method 1: Bundle Fonts (Recommended) #### Step 1: Download Font Files + ```bash # Create fonts directory mkdir fonts @@ -51,6 +56,7 @@ mkdir fonts ``` #### Step 2: Add to Android + ```bash # Create assets/fonts directory mkdir -p android/app/src/main/assets/fonts @@ -60,13 +66,16 @@ cp fonts/*.ttf android/app/src/main/assets/fonts/ ``` #### Step 3: Add to iOS + 1. **Add to Xcode Project:** + - Open your iOS project in Xcode - Right-click on your project → "Add Files to [ProjectName]" - Select your TTF files - Make sure "Add to target" is checked 2. **Update Info.plist:** + ```xml UIAppFonts @@ -78,6 +87,7 @@ cp fonts/*.ttf android/app/src/main/assets/fonts/ ``` #### Step 4: Use with setTheme + ```typescript import Instabug from 'instabug-reactnative'; import { Platform } from 'react-native'; @@ -88,19 +98,19 @@ const applyCustomTheme = () => { primaryColor: '#2196F3', backgroundColor: '#FFFFFF', primaryTextColor: '#333333', - + // Text styles (Android only) primaryTextStyle: 'normal', secondaryTextStyle: 'normal', ctaTextStyle: 'bold', - + // Fonts - Android (use font paths) ...(Platform.OS === 'android' && { primaryFontPath: '/data/user/0/com.yourapp/files/fonts/Roboto-Regular.ttf', secondaryFontPath: '/data/user/0/com.yourapp/files/fonts/Roboto-Light.ttf', ctaFontPath: '/data/user/0/com.yourapp/files/fonts/Roboto-Bold.ttf', }), - + // Fonts - iOS (use font paths, not assets) ...(Platform.OS === 'ios' && { primaryFontPath: 'fonts/Roboto-Regular.ttf', @@ -112,6 +122,7 @@ const applyCustomTheme = () => { ``` ### Method 2: System Fonts Only + ```typescript import Instabug from 'instabug-reactnative'; @@ -123,12 +134,12 @@ const applySystemTheme = () => { primaryTextColor: '#333333', secondaryTextColor: '#666666', titleTextColor: '#000000', - + // Text styles (Android only) primaryTextStyle: 'normal', secondaryTextStyle: 'normal', ctaTextStyle: 'bold', - + // No font paths = uses system fonts }); }; @@ -139,11 +150,13 @@ const applySystemTheme = () => { ### Method 1: Expo Fonts (Recommended for Expo) #### Step 1: Install Expo Fonts + ```bash npx expo install expo-font ``` #### Step 2: Download and Add Fonts + ```bash # Create fonts directory mkdir fonts @@ -153,6 +166,7 @@ mkdir fonts ``` #### Step 3: Configure app.json + ```json { "expo": { @@ -175,6 +189,7 @@ mkdir fonts ``` #### Step 4: Load Fonts in Your App + ```typescript import * as Font from 'expo-font'; import { useEffect, useState } from 'react'; @@ -203,6 +218,7 @@ export default function App() { ``` #### Step 5: Use with setTheme + ```typescript import Instabug from 'instabug-reactnative'; import { Platform } from 'react-native'; @@ -213,12 +229,12 @@ const applyExpoTheme = () => { primaryColor: '#2196F3', backgroundColor: '#FFFFFF', primaryTextColor: '#333333', - + // Text styles (Android only) primaryTextStyle: 'normal', secondaryTextStyle: 'normal', ctaTextStyle: 'bold', - + // Fonts - use font paths for both platforms primaryFontPath: 'fonts/Roboto-Regular.ttf', secondaryFontPath: 'fonts/Inter-Regular.ttf', @@ -228,16 +244,19 @@ const applyExpoTheme = () => { ``` ### Method 2: Expo with Bundle Fonts + Same as Regular React Native Method 1, but fonts are automatically included in the Expo build. ## Asset Linking Options ### Option 1: Manual Copy (Current Method) + - Copy TTF files to native directories - Update Info.plist manually - Works with all setups ### Option 2: React Native CLI Linking + ```bash # Create a react-native.config.js file module.exports = { @@ -246,11 +265,13 @@ module.exports = { ``` Then run: + ```bash npx react-native link ``` ### Option 3: Expo Asset Linking + ```json { "expo": { @@ -265,11 +286,13 @@ npx react-native link ``` ### Option 4: Metro Asset Plugin + ```bash npm install --save-dev react-native-asset ``` Create `react-native.config.js`: + ```javascript module.exports = { assets: ['./fonts/'], @@ -279,6 +302,7 @@ module.exports = { ## Usage Examples ### Example 1: Google Fonts (Roboto) + ```typescript // Download: Roboto-Regular.ttf, Roboto-Bold.ttf, Roboto-Light.ttf // Add to project using any method above @@ -290,12 +314,12 @@ const applyRobotoTheme = () => { primaryTextColor: '#212121', secondaryTextColor: '#757575', titleTextColor: '#000000', - + // Text styles (Android only) primaryTextStyle: 'normal', secondaryTextStyle: 'normal', ctaTextStyle: 'bold', - + // Font paths for both platforms primaryFontPath: 'fonts/Roboto-Regular.ttf', secondaryFontPath: 'fonts/Roboto-Light.ttf', @@ -305,6 +329,7 @@ const applyRobotoTheme = () => { ``` ### Example 2: Custom Fonts (Inter) + ```typescript // Download: Inter-Regular.ttf, Inter-Bold.ttf, Inter-Medium.ttf // Add to project using any method above @@ -316,12 +341,12 @@ const applyInterTheme = () => { primaryTextColor: '#1F2937', secondaryTextColor: '#6B7280', titleTextColor: '#111827', - + // Text styles (Android only) primaryTextStyle: 'normal', secondaryTextStyle: 'normal', ctaTextStyle: 'bold', - + // Font paths for both platforms primaryFontPath: 'fonts/Inter-Regular.ttf', secondaryFontPath: 'fonts/Inter-Medium.ttf', @@ -331,6 +356,7 @@ const applyInterTheme = () => { ``` ### Example 3: System Fonts Only + ```typescript const applySystemTheme = () => { Instabug.setTheme({ @@ -339,7 +365,7 @@ const applySystemTheme = () => { primaryTextColor: '#000000', secondaryTextColor: '#8E8E93', titleTextColor: '#000000', - + // Text styles (Android only) - no font paths = uses system fonts primaryTextStyle: 'normal', secondaryTextStyle: 'normal', @@ -349,6 +375,7 @@ const applySystemTheme = () => { ``` ### Example 4: Mixed Approach + ```typescript const applyMixedTheme = () => { Instabug.setTheme({ @@ -357,12 +384,12 @@ const applyMixedTheme = () => { primaryTextColor: '#2D3436', secondaryTextColor: '#636E72', titleTextColor: '#2D3436', - + // Text styles (Android only) primaryTextStyle: 'normal', secondaryTextStyle: 'normal', ctaTextStyle: 'bold', - + // Custom font only for CTA - rest use system fonts ctaFontPath: 'fonts/Roboto-Bold.ttf', }); @@ -408,8 +435,10 @@ Instabug.setTheme({ ### Common Issues #### 1. Font Not Loading + **Symptoms:** Font appears as system font or doesn't change **Solutions:** + - Check font filename matches exactly (case-sensitive) - Verify font is added to both Android and iOS - For iOS, check Info.plist entries @@ -417,22 +446,28 @@ Instabug.setTheme({ - **iOS users**: Make sure you're using `*FontPath` properties, not `*FontAsset` #### 2. Font Loading in Expo + **Symptoms:** Font works in development but not in production **Solutions:** + - Use `expo-font` to load fonts before app starts - Ensure fonts are included in app.json - Test with `expo build` or EAS Build #### 3. Font File Issues + **Symptoms:** App crashes or font doesn't load **Solutions:** + - Verify TTF file is not corrupted - Check file size (should be reasonable, not 0 bytes) - Ensure font file is valid TTF/OTF format #### 4. Performance Issues + **Symptoms:** App slow to start or font loading delays **Solutions:** + - Use system fonts for better performance - Limit number of custom fonts - Preload fonts in app initialization @@ -440,12 +475,14 @@ Instabug.setTheme({ ### Debug Steps 1. **Check Font Loading:** + ```typescript // Add this to debug font loading console.log('Available fonts:', Instabug.getAvailableFonts()); // If available ``` 2. **Verify File Paths:** + ```bash # Check if fonts are in the right place ls -la android/app/src/main/assets/fonts/ @@ -453,6 +490,7 @@ ls -la ios/YourApp/ ``` 3. **Test with System Fonts First:** + ```typescript // Test with system fonts to ensure setTheme works Instabug.setTheme({ @@ -469,7 +507,7 @@ Instabug.setTheme({ 4. **Test on Both Platforms:** Fonts may behave differently on iOS vs Android 5. **Use Standard Font Weights:** Regular, Bold, Light are most reliable 6. **Keep Font Files Small:** Optimize TTF files for mobile -7. **Use *FontPath Properties:** Ensures compatibility with both platforms +7. **Use \*FontPath Properties:** Ensures compatibility with both platforms ## Summary @@ -481,4 +519,4 @@ Instabug.setTheme({ - **System Fonts:** No setup required, best performance - **Platform Compatibility:** Use `*FontPath` properties for both platforms -The native bridge handles all font loading automatically once fonts are properly added to your project! \ No newline at end of file +The native bridge handles all font loading automatically once fonts are properly added to your project! From 45714518935bc24ff214b2ee8ad301be6f5311ac Mon Sep 17 00:00:00 2001 From: AyaMahmoud148 Date: Sun, 20 Jul 2025 13:06:30 +0300 Subject: [PATCH 10/26] fix: rename some variables --- .../RNInstabugReactnativeModule.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/android/src/main/java/com/instabug/reactlibrary/RNInstabugReactnativeModule.java b/android/src/main/java/com/instabug/reactlibrary/RNInstabugReactnativeModule.java index fa9d6cee7..551eecb09 100644 --- a/android/src/main/java/com/instabug/reactlibrary/RNInstabugReactnativeModule.java +++ b/android/src/main/java/com/instabug/reactlibrary/RNInstabugReactnativeModule.java @@ -1370,16 +1370,16 @@ public void run() { com.instabug.library.model.IBGTheme.Builder builder = new com.instabug.library.model.IBGTheme.Builder(); // Apply colors - applyColorIfPresent(themeConfig, builder, "primaryColor", (b, color) -> b.setPrimaryColor(color)); - applyColorIfPresent(themeConfig, builder, "secondaryTextColor", (b, color) -> b.setSecondaryTextColor(color)); - applyColorIfPresent(themeConfig, builder, "primaryTextColor", (b, color) -> b.setPrimaryTextColor(color)); - applyColorIfPresent(themeConfig, builder, "titleTextColor", (b, color) -> b.setTitleTextColor(color)); - applyColorIfPresent(themeConfig, builder, "backgroundColor", (b, color) -> b.setBackgroundColor(color)); + applyColorIfPresent(themeConfig, builder, "primaryColor", (themeBuilder, color) -> themeBuilder.setPrimaryColor(color)); + applyColorIfPresent(themeConfig, builder, "secondaryTextColor", (themeBuilder, color) -> themeBuilder.setSecondaryTextColor(color)); + applyColorIfPresent(themeConfig, builder, "primaryTextColor", (themeBuilder, color) -> themeBuilder.setPrimaryTextColor(color)); + applyColorIfPresent(themeConfig, builder, "titleTextColor", (themeBuilder, color) -> themeBuilder.setTitleTextColor(color)); + applyColorIfPresent(themeConfig, builder, "backgroundColor", (themeBuilder, color) -> themeBuilder.setBackgroundColor(color)); // Apply text styles - applyTextStyleIfPresent(themeConfig, builder, "primaryTextStyle", (b, style) -> b.setPrimaryTextStyle(style)); - applyTextStyleIfPresent(themeConfig, builder, "secondaryTextStyle", (b, style) -> b.setSecondaryTextStyle(style)); - applyTextStyleIfPresent(themeConfig, builder, "ctaTextStyle", (b, style) -> b.setCtaTextStyle(style)); + applyTextStyleIfPresent(themeConfig, builder, "primaryTextStyle", (themeBuilder, style) -> themeBuilder.setPrimaryTextStyle(style)); + applyTextStyleIfPresent(themeConfig, builder, "secondaryTextStyle", (themeBuilder, style) -> themeBuilder.setSecondaryTextStyle(style)); + applyTextStyleIfPresent(themeConfig, builder, "ctaTextStyle", (themeBuilder, style) -> themeBuilder.setCtaTextStyle(style)); setFontIfPresent(themeConfig, builder, "primaryFontPath", "primaryFontAsset", "primary"); setFontIfPresent(themeConfig, builder, "secondaryFontPath", "secondaryFontAsset", "secondary"); setFontIfPresent(themeConfig, builder, "ctaFontPath", "ctaFontAsset", "CTA"); From eb03bcaacdf8ff678508b3d578801d5dd9f103af Mon Sep 17 00:00:00 2001 From: AyaMahmoud148 Date: Thu, 31 Jul 2025 10:43:27 +0300 Subject: [PATCH 11/26] chore: remove deperecated APIs --- examples/default/src/navigation/HomeStack.tsx | 2 - .../default/src/screens/apm/APMScreen.tsx | 1 - .../default/src/screens/apm/TracesScreen.tsx | 70 ------------------- ios/RNInstabug/InstabugAPMBridge.m | 35 ---------- ios/RNInstabug/InstabugBugReportingBridge.m | 2 +- ios/RNInstabug/InstabugReactBridge.m | 14 +--- src/index.ts | 2 - src/models/Trace.ts | 33 --------- src/modules/APM.ts | 24 ------- src/modules/BugReporting.ts | 5 +- src/modules/Instabug.ts | 34 ++------- src/native/NativeAPM.ts | 4 -- src/native/NativeInstabug.ts | 4 -- test/models/Trace.spec.ts | 39 ----------- test/modules/APM.spec.ts | 56 +-------------- 15 files changed, 11 insertions(+), 314 deletions(-) delete mode 100644 examples/default/src/screens/apm/TracesScreen.tsx delete mode 100644 src/models/Trace.ts delete mode 100644 test/models/Trace.spec.ts diff --git a/examples/default/src/navigation/HomeStack.tsx b/examples/default/src/navigation/HomeStack.tsx index 090aa6587..f3ebbf79b 100644 --- a/examples/default/src/navigation/HomeStack.tsx +++ b/examples/default/src/navigation/HomeStack.tsx @@ -22,7 +22,6 @@ import { import { GoogleMapsScreen } from '../screens/user-steps/GoogleMapsScreen'; import { LargeImageListScreen } from '../screens/user-steps/LargeImageListScreen'; import { APMScreen } from '../screens/apm/APMScreen'; -import { TracesScreen } from '../screens/apm/TracesScreen'; import { NetworkScreen } from '../screens/apm/NetworkScreen'; import { FlowsScreen } from '../screens/apm/FlowsScreen'; import { SessionReplayScreen } from '../screens/SessionReplayScreen'; @@ -140,7 +139,6 @@ export const HomeStackNavigator: React.FC = () => { - APM.endAppLaunch()} /> navigation.navigate('NetworkTraces')} /> - navigation.navigate('ExecutionTraces')} /> navigation.navigate('AppFlows')} /> navigation.navigate('WebViews')} /> navigation.navigate('ComplexViews')} /> diff --git a/examples/default/src/screens/apm/TracesScreen.tsx b/examples/default/src/screens/apm/TracesScreen.tsx deleted file mode 100644 index bd3e41838..000000000 --- a/examples/default/src/screens/apm/TracesScreen.tsx +++ /dev/null @@ -1,70 +0,0 @@ -import React, { useState } from 'react'; -import { APM, Trace } from 'instabug-reactnative'; -import { ScrollView } from 'react-native'; -import { Section } from '../../components/Section'; -import { Screen } from '../../components/Screen'; -import { VStack } from 'native-base'; -import { InputField } from '../../components/InputField'; -import { CustomButton } from '../../components/CustomButton'; -import BackgroundTimer from 'react-native-background-timer'; - -export const TracesScreen: React.FC = () => { - const [traceName, setTraceName] = useState(''); - const [traceAttributeKey, setTraceAttributeKey] = useState(''); - const [traceAttributeValue, setTraceAttributeValue] = useState(''); - let executionTrace: Trace; - - async function startTrace() { - executionTrace = await APM.startExecutionTrace(traceName ?? ''); - } - - async function startDelayedTrace() { - return BackgroundTimer.setTimeout(async () => { - executionTrace = await APM.startExecutionTrace(traceName ?? ''); - }, 5000); - } - - function setTraceAttribute() { - if (!executionTrace) { - console.log('Please, start a trace before setting attributes.'); - } - return executionTrace.setAttribute(traceAttributeKey ?? '', traceAttributeValue ?? ''); - } - - function endExecutionTrace() { - if (!executionTrace) { - console.log('Please, start a trace before ending it.'); - } - return executionTrace.end(); - } - - return ( - - -
- - setTraceName(text)} - value={traceName} - /> - - - setTraceAttributeKey(text)} - value={traceAttributeKey} - /> - setTraceAttributeValue(text)} - value={traceAttributeValue} - /> - - - -
- - - ); -}; diff --git a/ios/RNInstabug/InstabugAPMBridge.m b/ios/RNInstabug/InstabugAPMBridge.m index c28c7f425..29319264d 100644 --- a/ios/RNInstabug/InstabugAPMBridge.m +++ b/ios/RNInstabug/InstabugAPMBridge.m @@ -61,41 +61,6 @@ - (id) init IBGAPM.autoUITraceEnabled = isEnabled; } -// Starts new execution trace with the specified `name`. -// -// Deprecated see [startFlow: (NSString *)name] -RCT_EXPORT_METHOD(startExecutionTrace:(NSString *)name :(NSString *)id - :(RCTPromiseResolveBlock)resolve - :(RCTPromiseRejectBlock)reject) { - IBGExecutionTrace *trace = [IBGAPM startExecutionTraceWithName:name]; - if (trace != nil) { - [traces setObject: trace forKey: id]; - resolve(id); - } else { - resolve([NSNull null]); - } -} - -// Sets a user defined attribute for the execution trace. -// -// Deprecated see [setFlowAttribute:(NSString *)name :(NSString *)key :(NSString *_Nullable)value] -RCT_EXPORT_METHOD(setExecutionTraceAttribute:(NSString *)id :(NSString *)key :(NSString *)value) { - IBGExecutionTrace *trace = [traces objectForKey:id]; - if (trace != nil) { - [trace setAttributeWithKey:key value:value]; - } -} - -// Ends execution trace with the specified `name`. -// -// Deprecated see [endFlow: (NSString *)name] -RCT_EXPORT_METHOD(endExecutionTrace:(NSString *)id) { - IBGExecutionTrace *trace = [traces objectForKey:id]; - if (trace != nil) { - [trace end]; - } -} - // Starts a flow trace with the specified `name`, // allowing the SDK to capture and analyze the flow of execution within the application. RCT_EXPORT_METHOD(startFlow: (NSString *)name) { diff --git a/ios/RNInstabug/InstabugBugReportingBridge.m b/ios/RNInstabug/InstabugBugReportingBridge.m index 75e058eb7..e5833e2c4 100644 --- a/ios/RNInstabug/InstabugBugReportingBridge.m +++ b/ios/RNInstabug/InstabugBugReportingBridge.m @@ -216,7 +216,7 @@ - (void) showBugReportingWithReportTypeAndOptionsHelper:(NSArray*)args { } } - [IBGBugReporting setCommentMinimumCharacterCountForReportTypes:parsedReportTypes withLimit:limit.intValue]; + [IBGBugReporting setCommentMinimumCharacterCount:limit.intValue forBugReportType:parsedReportTypes]; } RCT_EXPORT_METHOD(addUserConsent:(NSString *)key diff --git a/ios/RNInstabug/InstabugReactBridge.m b/ios/RNInstabug/InstabugReactBridge.m index a48851ba8..e86479067 100644 --- a/ios/RNInstabug/InstabugReactBridge.m +++ b/ios/RNInstabug/InstabugReactBridge.m @@ -170,7 +170,7 @@ - (dispatch_queue_t)methodQueue { } RCT_EXPORT_METHOD(setPrimaryColor:(UIColor *)color) { - Instabug.tintColor = color; + Instabug.theme.primaryColor = color; } RCT_EXPORT_METHOD(appendTags:(NSArray *)tags) { @@ -355,18 +355,6 @@ - (dispatch_queue_t)methodQueue { } } -RCT_EXPORT_METHOD(addExperiments:(NSArray *)experiments) { - [Instabug addExperiments:experiments]; -} - -RCT_EXPORT_METHOD(removeExperiments:(NSArray *)experiments) { - [Instabug removeExperiments:experiments]; -} - -RCT_EXPORT_METHOD(clearAllExperiments) { - [Instabug clearAllExperiments]; -} - RCT_EXPORT_METHOD(addFeatureFlags:(NSDictionary *)featureFlagsMap) { NSMutableArray *featureFlags = [NSMutableArray array]; for(id key in featureFlagsMap){ diff --git a/src/index.ts b/src/index.ts index 6e7de0284..406275095 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,7 +1,6 @@ // Models import type { InstabugConfig } from './models/InstabugConfig'; import Report from './models/Report'; -import Trace from './models/Trace'; // Modules import * as APM from './modules/APM'; import * as BugReporting from './modules/BugReporting'; @@ -19,7 +18,6 @@ import type { SessionMetadata } from './models/SessionMetadata'; export * from './utils/Enums'; export { Report, - Trace, APM, BugReporting, CrashReporting, diff --git a/src/models/Trace.ts b/src/models/Trace.ts deleted file mode 100644 index 19cd26d58..000000000 --- a/src/models/Trace.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { NativeAPM } from '../native/NativeAPM'; -import type * as APM from '../modules/APM'; - -export default class Trace { - constructor( - public readonly id: string, - public readonly name: string = '', - public readonly attributes: Record = {}, - ) {} - - /** - * Adds an attribute with a specified key and value to the Trace to be sent. - * - * @param key - The key of the attribute. - * @param value - The value of the attribute. - * - * @deprecated Please migrate to the App Flows APIs: {@link APM.startFlow}, {@link APM.endFlow}, and {@link APM.setFlowAttribute}. - */ - setAttribute(key: string, value: string) { - NativeAPM.setExecutionTraceAttribute(this.id, key, value); - this.attributes[key] = value; - } - - /** - * Ends the execution trace. - * - * @deprecated Please migrate to the App Flows APIs: {@link APM.startFlow}, {@link APM.endFlow}, and {@link APM.setFlowAttribute}. - */ - - end() { - NativeAPM.endExecutionTrace(this.id); - } -} diff --git a/src/modules/APM.ts b/src/modules/APM.ts index 92d401389..9f2dcbe01 100644 --- a/src/modules/APM.ts +++ b/src/modules/APM.ts @@ -1,6 +1,5 @@ import { Platform } from 'react-native'; -import Trace from '../models/Trace'; import { NativeAPM } from '../native/NativeAPM'; import { NativeInstabug } from '../native/NativeInstabug'; @@ -48,29 +47,6 @@ export const setAutoUITraceEnabled = (isEnabled: boolean) => { NativeAPM.setAutoUITraceEnabled(isEnabled); }; -/** - * Starts a custom execution trace. - * - * Returns a promise which resolves with the trace reference if APM is enabled; otherwise, the promise is rejected. - * - * @param name - The name of the trace to start. - * @returns A promise that resolves with a Trace object. - * - * @deprecated Please migrate to the App Flows APIs: {@link startFlow}, {@link endFlow}, and {@link setFlowAttribute}. - */ -export const startExecutionTrace = async (name: string): Promise => { - const TRACE_NOT_STARTED_APM_NOT_ENABLED = `Execution trace "${name}" wasn't created. Please make sure to enable APM first by following the instructions at this link: https://docs.instabug.com/reference#enable-or-disable-apm`; - const timestamp = Date.now() + ''; - - const id = await NativeAPM.startExecutionTrace(name, timestamp); - - if (!id) { - throw new Error(TRACE_NOT_STARTED_APM_NOT_ENABLED); - } - - return new Trace(id, name); -}; - /** * Starts an AppFlow with the specified name. * diff --git a/src/modules/BugReporting.ts b/src/modules/BugReporting.ts index 486169ecc..c514e1ba9 100644 --- a/src/modules/BugReporting.ts +++ b/src/modules/BugReporting.ts @@ -245,7 +245,10 @@ export const setDisclaimerText = (text: string) => { * Sets a minimum number of characters as a requirement for the comments field in the different report types. * @param limit int number of characters. * @param reportTypes (Optional) Array of reportType. If it's not passed, the limit will apply to all report types. + * @platform iOS */ export const setCommentMinimumCharacterCount = (limit: number, reportTypes?: ReportType[]) => { - NativeBugReporting.setCommentMinimumCharacterCount(limit, reportTypes ?? []); + if (Platform.OS === 'ios') { + NativeBugReporting.setCommentMinimumCharacterCount(limit, reportTypes ?? []); + } }; diff --git a/src/modules/Instabug.ts b/src/modules/Instabug.ts index f7d582e70..30c6b0cbc 100644 --- a/src/modules/Instabug.ts +++ b/src/modules/Instabug.ts @@ -389,9 +389,12 @@ export const setColorTheme = (sdkTheme: ColorTheme) => { * To use, import processColor and pass to it with argument the color hex * as argument. * @param color A color to set the UI elements of the SDK to. + * @platform iOS */ export const setPrimaryColor = (color: string) => { - NativeInstabug.setPrimaryColor(processColor(color)); + if (Platform.OS === 'ios') { + NativeInstabug.setPrimaryColor(processColor(color)); + } }; /** @@ -775,35 +778,6 @@ export const reportScreenChange = (screenName: string) => { NativeInstabug.reportScreenChange(screenName); }; -/** - * Add experiments to next report. - * @param experiments An array of experiments to add to the next report. - * - * @deprecated Please migrate to the new Feature Flags APIs: {@link addFeatureFlags}. - */ -export const addExperiments = (experiments: string[]) => { - NativeInstabug.addExperiments(experiments); -}; - -/** - * Remove experiments from next report. - * @param experiments An array of experiments to remove from the next report. - * - * @deprecated Please migrate to the new Feature Flags APIs: {@link removeFeatureFlags}. - */ -export const removeExperiments = (experiments: string[]) => { - NativeInstabug.removeExperiments(experiments); -}; - -/** - * Clear all experiments - * - * @deprecated Please migrate to the new Feature Flags APIs: {@link removeAllFeatureFlags}. - */ -export const clearAllExperiments = () => { - NativeInstabug.clearAllExperiments(); -}; - /** * Add feature flags to the next report. * @param featureFlags An array of feature flags to add to the next report. diff --git a/src/native/NativeAPM.ts b/src/native/NativeAPM.ts index 9fa30b702..86d017167 100644 --- a/src/native/NativeAPM.ts +++ b/src/native/NativeAPM.ts @@ -34,10 +34,6 @@ export interface ApmNativeModule extends NativeModule { endAppLaunch(): void; // Execution Traces APIs // - startExecutionTrace(name: string, timestamp: string): Promise; - setExecutionTraceAttribute(id: string, key: string, value: string): void; - endExecutionTrace(id: string): void; - // App Flows APIs // startFlow(name: string): void; endFlow(name: string): void; diff --git a/src/native/NativeInstabug.ts b/src/native/NativeInstabug.ts index 7032bbc07..64dc0b20b 100644 --- a/src/native/NativeInstabug.ts +++ b/src/native/NativeInstabug.ts @@ -118,10 +118,6 @@ export interface InstabugNativeModule extends NativeModule { getTags(): Promise; // Experiments APIs // - addExperiments(experiments: string[]): void; - removeExperiments(experiments: string[]): void; - clearAllExperiments(): void; - addFeatureFlags(featureFlags: Record): void; removeFeatureFlags(featureFlags: string[]): void; diff --git a/test/models/Trace.spec.ts b/test/models/Trace.spec.ts deleted file mode 100644 index 8421b419a..000000000 --- a/test/models/Trace.spec.ts +++ /dev/null @@ -1,39 +0,0 @@ -import Trace from '../../src/models/Trace'; -import { NativeAPM } from '../../src/native/NativeAPM'; - -describe('Trace Model', () => { - it('should set the id, name and attributes if passed', () => { - const id = 'trace-id'; - const name = 'my-trace'; - const attributes = { screen: 'login' }; - const trace = new Trace(id, name, attributes); - - expect(trace.id).toBe(id); - expect(trace.name).toBe(name); - expect(trace.attributes).toBe(attributes); - }); - - it('should set execution trace attributes', () => { - const attribute = { key: 'isAuthenticated', value: 'yes' }; - - const trace = new Trace('trace-id'); - trace.setAttribute(attribute.key, attribute.value); - - expect(trace.attributes[attribute.key]).toBe(attribute.value); - expect(NativeAPM.setExecutionTraceAttribute).toBeCalledTimes(1); - expect(NativeAPM.setExecutionTraceAttribute).toBeCalledWith( - trace.id, - attribute.key, - attribute.value, - ); - }); - - it('should end execution trace', () => { - const trace = new Trace('trace-id'); - - trace.end(); - - expect(NativeAPM.endExecutionTrace).toBeCalledTimes(1); - expect(NativeAPM.endExecutionTrace).toBeCalledWith(trace.id); - }); -}); diff --git a/test/modules/APM.spec.ts b/test/modules/APM.spec.ts index cf932d25c..ea703d3ea 100644 --- a/test/modules/APM.spec.ts +++ b/test/modules/APM.spec.ts @@ -1,11 +1,8 @@ import { Platform } from 'react-native'; -import { mocked } from 'jest-mock'; - -import Trace from '../../src/models/Trace'; -import * as APM from '../../src/modules/APM'; import { NativeAPM } from '../../src/native/NativeAPM'; import { NativeInstabug } from '../../src/native/NativeInstabug'; +import * as APM from '../../src/modules/APM'; describe('APM Module', () => { it('should call the native method setEnabled', () => { @@ -51,57 +48,6 @@ describe('APM Module', () => { expect(NativeAPM.setAutoUITraceEnabled).toBeCalledWith(true); }); - it('should call the native method startExecutionTrace', () => { - mocked(NativeAPM).startExecutionTrace.mockResolvedValueOnce('trace-id'); - - APM.startExecutionTrace('trace'); - - expect(NativeAPM.startExecutionTrace).toBeCalledTimes(1); - expect(NativeAPM.startExecutionTrace).toBeCalledWith('trace', expect.any(String)); - }); - - it("should throw an error if native startExecutionTrace didn't return an ID", async () => { - mocked(NativeAPM).startExecutionTrace.mockResolvedValueOnce(null); - const promise = APM.startExecutionTrace('trace'); - - await expect(promise).rejects.toThrowError(/trace "trace" wasn't created/i); - }); - - it('should resolve with an Trace object if native startExecutionTrace returned an ID', async () => { - mocked(NativeAPM).startExecutionTrace.mockResolvedValueOnce('trace-id'); - - const promise = APM.startExecutionTrace('trace'); - - await expect(promise).resolves.toBeInstanceOf(Trace); - await expect(promise).resolves.toHaveProperty('name', 'trace'); - }); - - it('should call the native method setExecutionTraceAttribute', () => { - mocked(NativeAPM).startExecutionTrace.mockResolvedValueOnce('trace-id'); - - APM.startExecutionTrace('trace').then((trace) => { - trace.setAttribute('key', 'value'); - - expect(NativeAPM.setExecutionTraceAttribute).toBeCalledTimes(1); - expect(NativeAPM.setExecutionTraceAttribute).toBeCalledWith( - expect.any(String), - 'key', - 'value', - ); - }); - }); - - it('should call the native method endExecutionTrace', () => { - mocked(NativeAPM).startExecutionTrace.mockResolvedValueOnce('trace-id'); - - APM.startExecutionTrace('trace').then((trace) => { - trace.end(); - - expect(NativeAPM.endExecutionTrace).toBeCalledTimes(1); - expect(NativeAPM.endExecutionTrace).toBeCalledWith(expect.any(String)); - }); - }); - it('should call the native method startFlow', () => { const appFlowName = 'flowName'; From 3bcf21f09417328e4111ad4b8b701c4811da9679 Mon Sep 17 00:00:00 2001 From: AyaMahmoud148 Date: Thu, 31 Jul 2025 10:47:13 +0300 Subject: [PATCH 12/26] chore: add change log --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index abda7ed70..ccc5af24f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## [Unreleased](https://github.com/Instabug/Instabug-React-Native/compare/v15.0.1...dev) + +### Changed + +- **BREAKING** Remove deprecated APIs ([#1424](https://github.com/Instabug/Instabug-React-Native/pull/1424)). See migration guide for more details. + ## [15.0.1](https://github.com/Instabug/Instabug-React-Native/compare/v14.3.0...v15.0.1) ### Added From fdc8a20dbff2e8ccaaac7fe8c4456327c1ee14b8 Mon Sep 17 00:00:00 2001 From: AyaMahmoud148 Date: Thu, 31 Jul 2025 10:59:55 +0300 Subject: [PATCH 13/26] fix: removed unused tests --- .../reactlibrary/RNInstabugAPMModule.java | 75 ------------------- .../RNInstabugBugReportingModule.java | 28 ------- .../RNInstabugReactnativeModule.java | 75 +------------------ .../RNInstabugBugReportingModuleTest.java | 19 +---- .../RNInstabugReactnativeModuleTest.java | 41 +--------- .../ios/InstabugTests/InstabugAPMTests.m | 47 ------------ .../InstabugTests/InstabugBugReportingTests.m | 12 --- .../ios/InstabugTests/InstabugSampleTests.m | 37 --------- 8 files changed, 3 insertions(+), 331 deletions(-) diff --git a/android/src/main/java/com/instabug/reactlibrary/RNInstabugAPMModule.java b/android/src/main/java/com/instabug/reactlibrary/RNInstabugAPMModule.java index d75b4f75b..f5ab372a9 100644 --- a/android/src/main/java/com/instabug/reactlibrary/RNInstabugAPMModule.java +++ b/android/src/main/java/com/instabug/reactlibrary/RNInstabugAPMModule.java @@ -207,81 +207,6 @@ public void run() { }); } - /** - * Starts an execution trace - * - * @param name string name of the trace. - * - * @deprecated see {@link #startFlow(String)} - */ - @Deprecated - @ReactMethod - public void startExecutionTrace(final String name, final String id, final Promise promise) { - MainThreadHandler.runOnMainThread(new Runnable() { - @Override - public void run() { - try { - String result = ""; - ExecutionTrace trace = APM.startExecutionTrace(name); - if (trace != null) { - result = id; - traces.put(id, trace); - } - promise.resolve(result); - } catch (Exception e) { - e.printStackTrace(); - promise.resolve(null); - } - } - }); - } - - /** - * Adds a new attribute to trace - * - * @param id String id of the trace. - * @param key attribute key - * @param value attribute value. Null to remove attribute - * - * @deprecated see {@link #setFlowAttribute} - */ - @Deprecated - @ReactMethod - public void setExecutionTraceAttribute(final String id, final String key, final String value) { - MainThreadHandler.runOnMainThread(new Runnable() { - @Override - public void run() { - try { - traces.get(id).setAttribute(key, value); - } catch (Exception e) { - e.printStackTrace(); - } - } - }); - } - - /** - * Ends a trace - * - * @param id string id of the trace. - * - * @deprecated see {@link #endFlow} - */ - @Deprecated - @ReactMethod - public void endExecutionTrace(final String id) { - MainThreadHandler.runOnMainThread(new Runnable() { - @Override - public void run() { - try { - traces.get(id).end(); - } catch (Exception e) { - e.printStackTrace(); - } - } - }); - } - /** * Starts a UI trace * diff --git a/android/src/main/java/com/instabug/reactlibrary/RNInstabugBugReportingModule.java b/android/src/main/java/com/instabug/reactlibrary/RNInstabugBugReportingModule.java index 0dd9270e0..c491a88a9 100644 --- a/android/src/main/java/com/instabug/reactlibrary/RNInstabugBugReportingModule.java +++ b/android/src/main/java/com/instabug/reactlibrary/RNInstabugBugReportingModule.java @@ -390,34 +390,6 @@ public void run() { }); } - /** - * Sets a minimum number of characters as a requirement for the comments field in the different report types. - * @param limit int number of characters. - * @param reportTypes (Optional) Array of reportType. If it's not passed, the limit will apply to all report types. - */ - @ReactMethod - public void setCommentMinimumCharacterCount(final int limit, final ReadableArray reportTypes){ - MainThreadHandler.runOnMainThread(new Runnable() { - @SuppressLint("WrongConstant") - @Override - public void run() { - try { - final ArrayList keys = ArrayUtil.parseReadableArrayOfStrings(reportTypes); - final ArrayList types = ArgsRegistry.reportTypes.getAll(keys); - - final int[] typesInts = new int[types.size()]; - for (int i = 0; i < types.size(); i++) { - typesInts[i] = types.get(i); - } - - BugReporting.setCommentMinimumCharacterCount(limit, typesInts); - } catch (Exception e) { - e.printStackTrace(); - } - } - }); - } - /** * Adds a user consent item to the bug reporting * @param key A unique identifier string for the consent item. diff --git a/android/src/main/java/com/instabug/reactlibrary/RNInstabugReactnativeModule.java b/android/src/main/java/com/instabug/reactlibrary/RNInstabugReactnativeModule.java index 17f48656f..90568496c 100644 --- a/android/src/main/java/com/instabug/reactlibrary/RNInstabugReactnativeModule.java +++ b/android/src/main/java/com/instabug/reactlibrary/RNInstabugReactnativeModule.java @@ -281,26 +281,6 @@ public void run() { }); } - /** - * Set the primary color that the SDK will use to tint certain UI elements in the SDK - * - * @param primaryColor The value of the primary color , - * whatever this color was parsed from a resource color or hex color - * or RGB color values - */ - @ReactMethod - public void setPrimaryColor(final int primaryColor) { - MainThreadHandler.runOnMainThread(new Runnable() { - @Override - public void run() { - try { - Instabug.setPrimaryColor(primaryColor); - } catch (Exception e) { - e.printStackTrace(); - } - } - }); - } /** * Gets tags. @@ -1036,60 +1016,7 @@ public void run() { }); } - /** - * @deprecated see {@link #addFeatureFlags(ReadableArray)} - */ - @ReactMethod - public void addExperiments(final ReadableArray experiments) { - MainThreadHandler.runOnMainThread(new Runnable() { - @Override - public void run() { - try { - Object[] objectArray = ArrayUtil.toArray(experiments); - String[] stringArray = Arrays.copyOf(objectArray, objectArray.length, String[].class); - Instabug.addExperiments(Arrays.asList(stringArray)); - } catch (Exception e) { - e.printStackTrace(); - } - } - }); - } - - /** - * @deprecated see {@link #removeFeatureFlags(ReadableArray)} - */ - @ReactMethod - public void removeExperiments(final ReadableArray experiments) { - MainThreadHandler.runOnMainThread(new Runnable() { - @Override - public void run() { - try { - Object[] objectArray = ArrayUtil.toArray(experiments); - String[] stringArray = Arrays.copyOf(objectArray, objectArray.length, String[].class); - Instabug.removeExperiments(Arrays.asList(stringArray)); - } catch (Exception e) { - e.printStackTrace(); - } - } - }); - } - - /** - * @deprecated see {@link #removeAllFeatureFlags()} - */ - @ReactMethod - public void clearAllExperiments() { - MainThreadHandler.runOnMainThread(new Runnable() { - @Override - public void run() { - try { - Instabug.clearAllExperiments(); - } catch (Exception e) { - e.printStackTrace(); - } - } - }); - } + @ReactMethod public void addFeatureFlags(final ReadableMap featureFlagsMap) { diff --git a/android/src/test/java/com/instabug/reactlibrary/RNInstabugBugReportingModuleTest.java b/android/src/test/java/com/instabug/reactlibrary/RNInstabugBugReportingModuleTest.java index dc55e81a5..7b4c3b632 100644 --- a/android/src/test/java/com/instabug/reactlibrary/RNInstabugBugReportingModuleTest.java +++ b/android/src/test/java/com/instabug/reactlibrary/RNInstabugBugReportingModuleTest.java @@ -344,24 +344,7 @@ public Object answer(InvocationOnMock invocation) { BugReporting.setDisclaimerText(text); } - @Test - public void givenArgs$setCommentMinimumCharacterCount_whenQuery_thenShouldCallNativeApiWithArgs() { - // given - final int count = 20; - final Map args = ArgsRegistry.reportTypes; - final String[] keysArray = args.keySet().toArray(new String[0]); - JavaOnlyArray actualArray = new JavaOnlyArray(); - actualArray.pushString(keysArray[0]); - - // when - bugReportingModule.setCommentMinimumCharacterCount(count, actualArray); - - // then - verify(BugReporting.class, VerificationModeFactory.times(1)); - int type1 = args.get(keysArray[0]); - - BugReporting.setCommentMinimumCharacterCount(count, type1); - } + @Test public void TestAddUserConsent() { final Map args = ArgsRegistry.userConsentActionType; diff --git a/android/src/test/java/com/instabug/reactlibrary/RNInstabugReactnativeModuleTest.java b/android/src/test/java/com/instabug/reactlibrary/RNInstabugReactnativeModuleTest.java index f4f6f9bc1..137d11ce5 100644 --- a/android/src/test/java/com/instabug/reactlibrary/RNInstabugReactnativeModuleTest.java +++ b/android/src/test/java/com/instabug/reactlibrary/RNInstabugReactnativeModuleTest.java @@ -193,18 +193,6 @@ public void tearDown() { Instabug.setUserData(data); } - @Test - public void givenArg$setPrimaryColor_whenQuery_thenShouldCallNativeApiWithArg() { - // given - - int color = 3902; - // when - rnModule.setPrimaryColor(color); - // then - verify(Instabug.class,times(1)); - Instabug.setPrimaryColor(color); - } - @Test public void testSetCodePushVersion() { String codePushVersion = "123"; @@ -535,24 +523,7 @@ public void testIdentifyUserWithId() { } - @Test - public void givenArg$addExperiments_whenQuery_thenShouldCallNativeApiWithArg() { - // given - JavaOnlyArray array = new JavaOnlyArray(); - array.pushString("exp1"); - array.pushString("exp2"); - - // when - rnModule.addExperiments(array); - - // then - verify(Instabug.class,times(1)); - List expectedList = new ArrayList(); - expectedList.add("exp1"); - expectedList.add("exp2"); - Instabug.addExperiments(expectedList); - } - + @Test public void givenArg$removeExperiments_whenQuery_thenShouldCallNativeApiWithArg() { // given @@ -571,16 +542,6 @@ public void testIdentifyUserWithId() { Instabug.removeExperiments(expectedList); } - @Test - public void given$clearAllExperiments_whenQuery_thenShouldCallNativeApi() { - // when - rnModule.clearAllExperiments(); - - // then - verify(Instabug.class,times(1)); - Instabug.clearAllExperiments(); - } - @Test public void testAddFeatureFlags() { // given diff --git a/examples/default/ios/InstabugTests/InstabugAPMTests.m b/examples/default/ios/InstabugTests/InstabugAPMTests.m index 949393adb..40fae6129 100644 --- a/examples/default/ios/InstabugTests/InstabugAPMTests.m +++ b/examples/default/ios/InstabugTests/InstabugAPMTests.m @@ -86,53 +86,6 @@ - (void) testSetAutoUITraceEnabled { OCMVerify([mock setAutoUITraceEnabled:isEnabled]); } -- (void) testStartExecutionTrace { - id mock = OCMClassMock([IBGAPM class]); - NSString* traceName = @"Trace_1"; - NSString* traceKey = @"1"; - RCTPromiseResolveBlock resolve = ^(id result) {}; - RCTPromiseRejectBlock reject = ^(NSString *code, NSString *message, NSError *error) {}; - - OCMStub([mock startExecutionTraceWithName:traceName]); - [self.instabugBridge startExecutionTrace:traceName :traceKey :resolve :reject]; - OCMVerify([mock startExecutionTraceWithName:traceName]); -} - -- (void) testSetExecutionTraceAttribute { - NSString* traceName = @"Trace_1"; - NSString* traceId = @"Id_1"; - NSString* traceKey = @"Key_1"; - NSString* traceValue = @"1"; - RCTPromiseResolveBlock resolve = ^(id result) {}; - RCTPromiseRejectBlock reject = ^(NSString *code, NSString *message, NSError *error) {}; - IBGExecutionTrace * trace = [IBGExecutionTrace alloc]; - id mock = OCMClassMock([IBGAPM class]); - id traceMock = OCMPartialMock(trace); - - OCMStub([mock startExecutionTraceWithName:traceName]).andReturn(trace); - [self.instabugBridge startExecutionTrace:traceName :traceId :resolve :reject]; - - OCMStub([traceMock setAttributeWithKey:traceKey value:traceValue]); - [self.instabugBridge setExecutionTraceAttribute:traceId :traceKey :traceValue]; - OCMVerify([traceMock setAttributeWithKey:traceKey value:traceValue]); -} - -- (void) testEndExecutionTrace { - NSString* traceName = @"Trace_1"; - NSString* traceId = @"Id_1"; - RCTPromiseResolveBlock resolve = ^(id result) {}; - RCTPromiseRejectBlock reject = ^(NSString *code, NSString *message, NSError *error) {}; - IBGExecutionTrace * trace = [IBGExecutionTrace alloc]; - id apmMock = OCMClassMock([IBGAPM class]); - id traceMock = OCMPartialMock(trace); - - OCMStub([apmMock startExecutionTraceWithName:traceName]).andReturn(trace); - [self.instabugBridge startExecutionTrace:traceName :traceId :resolve :reject]; - - OCMStub([traceMock end]); - [self.instabugBridge endExecutionTrace:traceId]; - OCMVerify([traceMock end]); -} - (void) testStartFlow { id mock = OCMClassMock([IBGAPM class]); diff --git a/examples/default/ios/InstabugTests/InstabugBugReportingTests.m b/examples/default/ios/InstabugTests/InstabugBugReportingTests.m index f0b6f97ec..4d0250dc1 100644 --- a/examples/default/ios/InstabugTests/InstabugBugReportingTests.m +++ b/examples/default/ios/InstabugTests/InstabugBugReportingTests.m @@ -175,18 +175,6 @@ - (void) testSetDisclaimerText { OCMVerify([mock setDisclaimerText:text]); } -- (void) testSetCommentMinimumCharacterCount { - id mock = OCMClassMock([IBGBugReporting class]); - NSNumber *limit = [NSNumber numberWithInt:20]; - NSArray *reportTypesArr = [NSArray arrayWithObjects: @(IBGReportTypeBug), nil]; - IBGBugReportingReportType reportTypes = 0; - for (NSNumber *reportType in reportTypesArr) { - reportTypes |= [reportType intValue]; - } - OCMStub([mock setCommentMinimumCharacterCountForReportTypes:reportTypes withLimit:limit.intValue]); - [self.instabugBridge setCommentMinimumCharacterCount:limit reportTypes:reportTypesArr]; - OCMVerify([mock setCommentMinimumCharacterCountForReportTypes:reportTypes withLimit:limit.intValue]); -} - (void)testAddUserConsentWithKey { id mock = OCMClassMock([IBGBugReporting class]); diff --git a/examples/default/ios/InstabugTests/InstabugSampleTests.m b/examples/default/ios/InstabugTests/InstabugSampleTests.m index ded37c3af..3db399816 100644 --- a/examples/default/ios/InstabugTests/InstabugSampleTests.m +++ b/examples/default/ios/InstabugTests/InstabugSampleTests.m @@ -141,19 +141,6 @@ - (void)testSetColorTheme { [self waitForExpectationsWithTimeout:EXPECTATION_TIMEOUT handler:nil]; } -- (void)testSetPrimaryColor { - UIColor *color = [UIColor whiteColor]; - XCTestExpectation *expectation = [self expectationWithDescription:@"Testing [Instabug setPrimaryColor]"]; - - [self.instabugBridge setPrimaryColor:color]; - [[NSRunLoop mainRunLoop] performBlock:^{ - XCTAssertEqualObjects(Instabug.tintColor, color); - [expectation fulfill]; - }]; - - [self waitForExpectationsWithTimeout:EXPECTATION_TIMEOUT handler:nil]; -} - - (void)testAppendTags { id mock = OCMClassMock([Instabug class]); NSArray *tags = @[@"tag1", @"tag2"]; @@ -486,30 +473,6 @@ - (void)testClearLogs { OCMVerify([mock clearAllLogs]); } -- (void)testAddExperiments { - id mock = OCMClassMock([Instabug class]); - NSArray *experiments = @[@"exp1", @"exp2"]; - - OCMStub([mock addExperiments:experiments]); - [self.instabugBridge addExperiments:experiments]; - OCMVerify([mock addExperiments:experiments]); -} - -- (void)testRemoveExperiments { - id mock = OCMClassMock([Instabug class]); - NSArray *experiments = @[@"exp1", @"exp2"]; - - OCMStub([mock removeExperiments:experiments]); - [self.instabugBridge removeExperiments:experiments]; - OCMVerify([mock removeExperiments:experiments]); -} - -- (void)testClearAllExperiments { - id mock = OCMClassMock([Instabug class]); - OCMStub([mock clearAllExperiments]); - [self.instabugBridge clearAllExperiments]; - OCMVerify([mock clearAllExperiments]); -} - (void)testAddFeatureFlags { id mock = OCMClassMock([Instabug class]); From d1086e15fa77ab67ec37205d4ae4b9582cabcc0e Mon Sep 17 00:00:00 2001 From: AyaMahmoud148 Date: Thu, 31 Jul 2025 11:05:28 +0300 Subject: [PATCH 14/26] fix: remove tests --- ios/RNInstabug/InstabugAPMBridge.h | 6 ------ test/mocks/mockAPM.ts | 3 --- 2 files changed, 9 deletions(-) diff --git a/ios/RNInstabug/InstabugAPMBridge.h b/ios/RNInstabug/InstabugAPMBridge.h index 0a0ea397c..6b09dba6b 100644 --- a/ios/RNInstabug/InstabugAPMBridge.h +++ b/ios/RNInstabug/InstabugAPMBridge.h @@ -15,12 +15,6 @@ - (void)setAppLaunchEnabled:(BOOL)isEnabled; - (void)endAppLaunch; - (void)setAutoUITraceEnabled:(BOOL)isEnabled; -- (void)startExecutionTrace:(NSString *)name :(NSString *)id - :(RCTPromiseResolveBlock)resolve - :(RCTPromiseRejectBlock)reject DEPRECATED_MSG_ATTRIBUTE("Please use APM.startFlow instead."); -- (void)setExecutionTraceAttribute:(NSString *)id:(NSString *)key - :(NSString *)value DEPRECATED_MSG_ATTRIBUTE("Please use APM.setTraceAttribute instead."); -- (void)endExecutionTrace:(NSString *)id DEPRECATED_MSG_ATTRIBUTE("Please use APM.endFlow instead."); - (void)startFlow:(NSString *)name; - (void)endFlow:(NSString *)name; - (void)setFlowAttribute:(NSString *)name :(NSString *)key :(NSString *_Nullable)value; diff --git a/test/mocks/mockAPM.ts b/test/mocks/mockAPM.ts index 27644c694..7a9c5bac9 100644 --- a/test/mocks/mockAPM.ts +++ b/test/mocks/mockAPM.ts @@ -6,9 +6,6 @@ const mockAPM: ApmNativeModule = { setEnabled: jest.fn(), setAppLaunchEnabled: jest.fn(), setAutoUITraceEnabled: jest.fn(), - startExecutionTrace: jest.fn(), - setExecutionTraceAttribute: jest.fn(), - endExecutionTrace: jest.fn(), startFlow: jest.fn(), setFlowAttribute: jest.fn(), endFlow: jest.fn(), From bc123a934e0bea48a1319d4e59517ac410774fe3 Mon Sep 17 00:00:00 2001 From: AyaMahmoud148 Date: Thu, 31 Jul 2025 11:26:07 +0300 Subject: [PATCH 15/26] fix: test failure --- .../reactlibrary/RNInstabugAPMModuleTest.java | 11 ----------- .../RNInstabugReactnativeModuleTest.java | 18 ------------------ 2 files changed, 29 deletions(-) diff --git a/android/src/test/java/com/instabug/reactlibrary/RNInstabugAPMModuleTest.java b/android/src/test/java/com/instabug/reactlibrary/RNInstabugAPMModuleTest.java index 85ca1384d..dfac232fc 100644 --- a/android/src/test/java/com/instabug/reactlibrary/RNInstabugAPMModuleTest.java +++ b/android/src/test/java/com/instabug/reactlibrary/RNInstabugAPMModuleTest.java @@ -114,17 +114,6 @@ public void givenTruesetEnabled_whenQuery_thenShouldCallNativeApiWithEnabled() { APM.endAppLaunch(); } - @Test - public void givenString$startExecutionTrace_whenQuery_thenShouldCallNativeApi() { - Promise promise = mock(Promise.class); - // when - apmModule.startExecutionTrace("trace", "1", promise); - // then - verify(APM.class, times(1)); - APM.startExecutionTrace("trace"); - verify(promise).resolve(any()); - } - @Test public void testStartFlow() { String appFlowName = "appFlowName"; diff --git a/android/src/test/java/com/instabug/reactlibrary/RNInstabugReactnativeModuleTest.java b/android/src/test/java/com/instabug/reactlibrary/RNInstabugReactnativeModuleTest.java index 137d11ce5..9c25d3400 100644 --- a/android/src/test/java/com/instabug/reactlibrary/RNInstabugReactnativeModuleTest.java +++ b/android/src/test/java/com/instabug/reactlibrary/RNInstabugReactnativeModuleTest.java @@ -523,24 +523,6 @@ public void testIdentifyUserWithId() { } - - @Test - public void givenArg$removeExperiments_whenQuery_thenShouldCallNativeApiWithArg() { - // given - JavaOnlyArray array = new JavaOnlyArray(); - array.pushString("exp1"); - array.pushString("exp2"); - - // when - rnModule.removeExperiments(array); - - // then - verify(Instabug.class,times(1)); - List expectedList = new ArrayList(); - expectedList.add("exp1"); - expectedList.add("exp2"); - Instabug.removeExperiments(expectedList); - } @Test public void testAddFeatureFlags() { From 7018193b83698bde5c21d07f6c17cd7686fe2bc2 Mon Sep 17 00:00:00 2001 From: AyaMahmoud148 Date: Thu, 31 Jul 2025 11:43:16 +0300 Subject: [PATCH 16/26] fix: remove deprecated apis --- test/mocks/mockInstabug.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/test/mocks/mockInstabug.ts b/test/mocks/mockInstabug.ts index 391a00a38..b9b839bcc 100644 --- a/test/mocks/mockInstabug.ts +++ b/test/mocks/mockInstabug.ts @@ -49,9 +49,6 @@ const mockInstabug: InstabugNativeModule = { setPreSendingHandler: jest.fn(), reportScreenChange: jest.fn(), reportCurrentViewChange: jest.fn(), - addExperiments: jest.fn(), - removeExperiments: jest.fn(), - clearAllExperiments: jest.fn(), networkLogIOS: jest.fn(), networkLogAndroid: jest.fn(), addFeatureFlags: jest.fn(), From 8b0c750854b69c6a252d6307921f6ddf38b4862d Mon Sep 17 00:00:00 2001 From: AyaMahmoud148 Date: Thu, 31 Jul 2025 11:47:22 +0300 Subject: [PATCH 17/26] fix: remove tests --- test/modules/Instabug.spec.ts | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/test/modules/Instabug.spec.ts b/test/modules/Instabug.spec.ts index f6e36d8e4..14dbb1632 100644 --- a/test/modules/Instabug.spec.ts +++ b/test/modules/Instabug.spec.ts @@ -825,25 +825,6 @@ describe('Instabug Module', () => { expect(emitter.listenerCount(NativeEvents.PRESENDING_HANDLER)).toBe(1); }); - it('should call native addExperiments method', () => { - const experiments = ['exp1', 'exp2']; - Instabug.addExperiments(experiments); - expect(NativeInstabug.addExperiments).toBeCalledTimes(1); - expect(NativeInstabug.addExperiments).toBeCalledWith(experiments); - }); - - it('should call native removeExperiments method', () => { - const experiments = ['exp1', 'exp2']; - Instabug.removeExperiments(experiments); - expect(NativeInstabug.removeExperiments).toBeCalledTimes(1); - expect(NativeInstabug.removeExperiments).toBeCalledWith(experiments); - }); - - it('should call native clearAllExperiments method', () => { - Instabug.clearAllExperiments(); - expect(NativeInstabug.clearAllExperiments).toBeCalledTimes(1); - }); - it('should call native addFeatureFlags method', () => { const featureFlags: Array = [ { From 821ad6d781f6230183c1cf8c139a41d5d3f46347 Mon Sep 17 00:00:00 2001 From: AyaMahmoud148 Date: Thu, 31 Jul 2025 11:56:05 +0300 Subject: [PATCH 18/26] fix: unit test --- test/modules/Instabug.spec.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/modules/Instabug.spec.ts b/test/modules/Instabug.spec.ts index 14dbb1632..98d3aede2 100644 --- a/test/modules/Instabug.spec.ts +++ b/test/modules/Instabug.spec.ts @@ -455,7 +455,8 @@ describe('Instabug Module', () => { expect(NativeInstabug.setColorTheme).toBeCalledWith(theme); }); - it('should call the native method setPrimaryColor', () => { + it('should call the native method setPrimaryColor on iOS', () => { + Platform.OS = 'ios'; const color = '#fff'; Instabug.setPrimaryColor(color); From 69794340233cdb532847ddc4fe4efba2b30ed743 Mon Sep 17 00:00:00 2001 From: AyaMahmoud148 Date: Thu, 31 Jul 2025 12:40:39 +0300 Subject: [PATCH 19/26] remove commented code --- .../reactlibrary/RNInstabugAPMModule.java | 3 -- .../reactlibrary/RNInstabugAPMModuleTest.java | 28 ------------------- 2 files changed, 31 deletions(-) diff --git a/android/src/main/java/com/instabug/reactlibrary/RNInstabugAPMModule.java b/android/src/main/java/com/instabug/reactlibrary/RNInstabugAPMModule.java index f5ab372a9..6ed3541cb 100644 --- a/android/src/main/java/com/instabug/reactlibrary/RNInstabugAPMModule.java +++ b/android/src/main/java/com/instabug/reactlibrary/RNInstabugAPMModule.java @@ -12,7 +12,6 @@ import com.facebook.react.bridge.ReactMethod; import com.facebook.react.bridge.ReadableMap; import com.instabug.apm.APM; -import com.instabug.apm.model.ExecutionTrace; import com.instabug.apm.networking.APMNetworkLogger; import com.instabug.apm.networkinterception.cp.APMCPNetworkLog; import com.instabug.reactlibrary.utils.EventEmitterModule; @@ -33,8 +32,6 @@ public RNInstabugAPMModule(ReactApplicationContext reactApplicationContext) { super(reactApplicationContext); } - @Deprecated - HashMap traces = new HashMap(); @Nonnull @Override diff --git a/android/src/test/java/com/instabug/reactlibrary/RNInstabugAPMModuleTest.java b/android/src/test/java/com/instabug/reactlibrary/RNInstabugAPMModuleTest.java index dfac232fc..b10058f48 100644 --- a/android/src/test/java/com/instabug/reactlibrary/RNInstabugAPMModuleTest.java +++ b/android/src/test/java/com/instabug/reactlibrary/RNInstabugAPMModuleTest.java @@ -145,34 +145,6 @@ public void testSetFlowAttribute() { mockAPM.verifyNoMoreInteractions(); } - // @Test - // public void givenString$setExecutionTraceAttribute_whenQuery_thenShouldCallNativeApiWithIntArgs() { - // // given - // PowerMockito.mockStatic(APM.class); - // ExecutionTrace trace = mock(ExecutionTrace.class); - // Callback callback = mock(Callback.class); - // // when - // PowerMockito.whenNew(ExecutionTrace.class).withArguments("trace").thenReturn(trace); - // apmModule.startExecutionTrace("trace", "1", callback); - // apmModule.setExecutionTraceAttribute("trace", "key", "value"); - // // then - // verify(trace).setAttribute("key", "value"); - // } - - // @Test - // public void givenTrace$endExecutionTrace_whenQuery_thenShouldCallNativeApiWithIntArgs() { - // // given - // PowerMockito.mockStatic(APM.class); - // ExecutionTrace trace = mock(ExecutionTrace.class); - // Callback callback = mock(Callback.class); - // // when - // PowerMockito.whenNew(ExecutionTrace.class).withArguments("trace").thenReturn(trace); - // apmModule.startExecutionTrace("trace", "1", callback); - // apmModule.endExecutionTrace("1"); - // // then - // verify(trace).end(); - // } - @Test public void givenString$startUITrace_whenQuery_thenShouldCallNativeApiWithEnabled() { From 5fa987423aedce0bb23d33621e26c934d1a98830 Mon Sep 17 00:00:00 2001 From: AyaMahmoud148 Date: Thu, 31 Jul 2025 14:08:27 +0300 Subject: [PATCH 20/26] fix: resolve comments --- .../RNInstabugBugReportingModule.java | 27 +++++++++++++++++++ .../RNInstabugBugReportingModuleTest.java | 19 ++++++++++++- ios/RNInstabug/InstabugBugReportingBridge.m | 8 +++--- ios/RNInstabug/InstabugReactBridge.m | 6 ++--- src/modules/Instabug.ts | 12 ++------- 5 files changed, 53 insertions(+), 19 deletions(-) diff --git a/android/src/main/java/com/instabug/reactlibrary/RNInstabugBugReportingModule.java b/android/src/main/java/com/instabug/reactlibrary/RNInstabugBugReportingModule.java index c491a88a9..25d7da216 100644 --- a/android/src/main/java/com/instabug/reactlibrary/RNInstabugBugReportingModule.java +++ b/android/src/main/java/com/instabug/reactlibrary/RNInstabugBugReportingModule.java @@ -389,6 +389,33 @@ public void run() { } }); } + /** + * Sets a minimum number of characters as a requirement for the comments field in the different report types. + * @param limit int number of characters. + * @param reportTypes (Optional) Array of reportType. If it's not passed, the limit will apply to all report types. + */ + @ReactMethod + public void setCommentMinimumCharacterCount(final int limit, final ReadableArray reportTypes){ + MainThreadHandler.runOnMainThread(new Runnable() { + @SuppressLint("WrongConstant") + @Override + public void run() { + try { + final ArrayList keys = ArrayUtil.parseReadableArrayOfStrings(reportTypes); + final ArrayList types = ArgsRegistry.reportTypes.getAll(keys); + + final int[] typesInts = new int[types.size()]; + for (int i = 0; i < types.size(); i++) { + typesInts[i] = types.get(i); + } + + BugReporting.setCommentMinimumCharacterCount(limit, typesInts); + } catch (Exception e) { + e.printStackTrace(); + } + } + }); + } /** * Adds a user consent item to the bug reporting diff --git a/android/src/test/java/com/instabug/reactlibrary/RNInstabugBugReportingModuleTest.java b/android/src/test/java/com/instabug/reactlibrary/RNInstabugBugReportingModuleTest.java index 7b4c3b632..e4452c6e3 100644 --- a/android/src/test/java/com/instabug/reactlibrary/RNInstabugBugReportingModuleTest.java +++ b/android/src/test/java/com/instabug/reactlibrary/RNInstabugBugReportingModuleTest.java @@ -344,7 +344,24 @@ public Object answer(InvocationOnMock invocation) { BugReporting.setDisclaimerText(text); } - + @Test + public void givenArgs$setCommentMinimumCharacterCount_whenQuery_thenShouldCallNativeApiWithArgs() { + // given + final int count = 20; + final Map args = ArgsRegistry.reportTypes; + final String[] keysArray = args.keySet().toArray(new String[0]); + JavaOnlyArray actualArray = new JavaOnlyArray(); + actualArray.pushString(keysArray[0]); + + // when + bugReportingModule.setCommentMinimumCharacterCount(count, actualArray); + + // then + verify(BugReporting.class, VerificationModeFactory.times(1)); + int type1 = args.get(keysArray[0]); + + BugReporting.setCommentMinimumCharacterCount(count, type1); + } @Test public void TestAddUserConsent() { final Map args = ArgsRegistry.userConsentActionType; diff --git a/ios/RNInstabug/InstabugBugReportingBridge.m b/ios/RNInstabug/InstabugBugReportingBridge.m index e5833e2c4..70efaa129 100644 --- a/ios/RNInstabug/InstabugBugReportingBridge.m +++ b/ios/RNInstabug/InstabugBugReportingBridge.m @@ -205,18 +205,16 @@ - (void) showBugReportingWithReportTypeAndOptionsHelper:(NSArray*)args { } RCT_EXPORT_METHOD(setCommentMinimumCharacterCount:(nonnull NSNumber *)limit reportTypes:(NSArray *)reportTypes) { - IBGBugReportingReportType parsedReportTypes = 0; - + IBGBugReportingType parsedReportTypes = 0; if (![reportTypes count]) { - parsedReportTypes = @(IBGBugReportingReportTypeBug).integerValue | @(IBGBugReportingReportTypeFeedback).integerValue | @(IBGBugReportingReportTypeQuestion).integerValue; + parsedReportTypes = @(IBGBugReportingTypeBug).integerValue | @(IBGBugReportingTypeFeedback).integerValue | @(IBGBugReportingTypeQuestion).integerValue; } else { for (NSNumber *reportType in reportTypes) { parsedReportTypes |= [reportType intValue]; } } - - [IBGBugReporting setCommentMinimumCharacterCount:limit.intValue forBugReportType:parsedReportTypes]; + [IBGBugReporting setCommentMinimumCharacterCount:[limit integerValue] forBugReportType:parsedReportTypes]; } RCT_EXPORT_METHOD(addUserConsent:(NSString *)key diff --git a/ios/RNInstabug/InstabugReactBridge.m b/ios/RNInstabug/InstabugReactBridge.m index e2eeb89f1..3194d8777 100644 --- a/ios/RNInstabug/InstabugReactBridge.m +++ b/ios/RNInstabug/InstabugReactBridge.m @@ -62,8 +62,8 @@ - (dispatch_queue_t)methodQueue { RCT_EXPORT_METHOD(setReproStepsConfig:(IBGUserStepsMode)bugMode :(IBGUserStepsMode)crashMode:(IBGUserStepsMode)sessionReplayMode) { [Instabug setReproStepsFor:IBGIssueTypeBug withMode:bugMode]; - [Instabug setReproStepsFor:IBGIssueTypeCrash withMode:crashMode]; - [Instabug setReproStepsFor:IBGIssueTypeSessionReplay withMode:sessionReplayMode]; + [Instabug setReproStepsFor:IBGIssueTypeAllCrashes withMode:crashMode]; + [Instabug setReproStepsFor:IBGIssueTypeSessionReplay withMode:sessionReplayMode]; } RCT_EXPORT_METHOD(setFileAttachment:(NSString *)fileLocation) { @@ -170,7 +170,7 @@ - (dispatch_queue_t)methodQueue { } RCT_EXPORT_METHOD(setPrimaryColor:(UIColor *)color) { - Instabug.theme.primaryColor = color; + Instabug.tintColor = color; } RCT_EXPORT_METHOD(setTheme:(NSDictionary *)themeConfig) { diff --git a/src/modules/Instabug.ts b/src/modules/Instabug.ts index a07c760f8..1706d7bc4 100644 --- a/src/modules/Instabug.ts +++ b/src/modules/Instabug.ts @@ -1,10 +1,4 @@ -import { - AppState, - type AppStateStatus, - findNodeHandle, - Platform, - processColor, -} from 'react-native'; +import { AppState, type AppStateStatus, findNodeHandle, Platform } from 'react-native'; import type { NavigationContainerRefWithCurrent, @@ -393,9 +387,7 @@ export const setColorTheme = (sdkTheme: ColorTheme) => { * @platform iOS */ export const setPrimaryColor = (color: string) => { - if (Platform.OS === 'ios') { - NativeInstabug.setPrimaryColor(processColor(color)); - } + NativeInstabug.setTheme({ primaryColor: color }); }; /** From 50beca4b3f120ea997e6b41771114ba9557b3515 Mon Sep 17 00:00:00 2001 From: AyaMahmoud148 Date: Thu, 31 Jul 2025 14:18:49 +0300 Subject: [PATCH 21/26] fix: unit tests --- src/modules/Instabug.ts | 2 +- test/modules/Instabug.spec.ts | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/modules/Instabug.ts b/src/modules/Instabug.ts index 1706d7bc4..c6ec8ad39 100644 --- a/src/modules/Instabug.ts +++ b/src/modules/Instabug.ts @@ -384,7 +384,7 @@ export const setColorTheme = (sdkTheme: ColorTheme) => { * To use, import processColor and pass to it with argument the color hex * as argument. * @param color A color to set the UI elements of the SDK to. - * @platform iOS + * @deprecated Please migrate to the new UI customization API: {@link setTheme} */ export const setPrimaryColor = (color: string) => { NativeInstabug.setTheme({ primaryColor: color }); diff --git a/test/modules/Instabug.spec.ts b/test/modules/Instabug.spec.ts index 98d3aede2..695d7310e 100644 --- a/test/modules/Instabug.spec.ts +++ b/test/modules/Instabug.spec.ts @@ -1,7 +1,7 @@ import '../mocks/mockInstabugUtils'; import '../mocks/mockNetworkLogger'; -import { findNodeHandle, Platform, processColor } from 'react-native'; +import { findNodeHandle, Platform } from 'react-native'; import type { NavigationContainerRefWithCurrent } from '@react-navigation/native'; // Import the hook import { mocked } from 'jest-mock'; import waitForExpect from 'wait-for-expect'; @@ -458,10 +458,10 @@ describe('Instabug Module', () => { it('should call the native method setPrimaryColor on iOS', () => { Platform.OS = 'ios'; const color = '#fff'; - Instabug.setPrimaryColor(color); + Instabug.setTheme({ primaryColor: color }); - expect(NativeInstabug.setPrimaryColor).toBeCalledTimes(1); - expect(NativeInstabug.setPrimaryColor).toBeCalledWith(processColor(color)); + expect(NativeInstabug.setTheme).toBeCalledTimes(1); + expect(NativeInstabug.setTheme).toBeCalledWith({ primaryColor: color }); }); it('should call the native method appendTags', () => { From e3836b13d26d70563122eb2fbb0a7c0bb781e03e Mon Sep 17 00:00:00 2001 From: AyaMahmoud148 Date: Thu, 31 Jul 2025 14:49:55 +0300 Subject: [PATCH 22/26] fix: setCommentMinimumCharacterCountForBugReportType --- .../instabug/reactlibrary/RNInstabugBugReportingModule.java | 3 +-- .../reactlibrary/RNInstabugBugReportingModuleTest.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/android/src/main/java/com/instabug/reactlibrary/RNInstabugBugReportingModule.java b/android/src/main/java/com/instabug/reactlibrary/RNInstabugBugReportingModule.java index 25d7da216..420011ddb 100644 --- a/android/src/main/java/com/instabug/reactlibrary/RNInstabugBugReportingModule.java +++ b/android/src/main/java/com/instabug/reactlibrary/RNInstabugBugReportingModule.java @@ -409,8 +409,7 @@ public void run() { typesInts[i] = types.get(i); } - BugReporting.setCommentMinimumCharacterCount(limit, typesInts); - } catch (Exception e) { + BugReporting.setCommentMinimumCharacterCountForBugReportType(limit, typesInts); } catch (Exception e) { e.printStackTrace(); } } diff --git a/android/src/test/java/com/instabug/reactlibrary/RNInstabugBugReportingModuleTest.java b/android/src/test/java/com/instabug/reactlibrary/RNInstabugBugReportingModuleTest.java index e4452c6e3..15cef0e2f 100644 --- a/android/src/test/java/com/instabug/reactlibrary/RNInstabugBugReportingModuleTest.java +++ b/android/src/test/java/com/instabug/reactlibrary/RNInstabugBugReportingModuleTest.java @@ -360,7 +360,7 @@ public Object answer(InvocationOnMock invocation) { verify(BugReporting.class, VerificationModeFactory.times(1)); int type1 = args.get(keysArray[0]); - BugReporting.setCommentMinimumCharacterCount(count, type1); + BugReporting.setCommentMinimumCharacterCountForBugReportType(count, type1); } @Test public void TestAddUserConsent() { From 48fc00a170921433864f9038326e705070d99f33 Mon Sep 17 00:00:00 2001 From: AyaMahmoud148 Date: Thu, 31 Jul 2025 14:55:15 +0300 Subject: [PATCH 23/26] fix: ios tests --- examples/default/ios/InstabugTests/InstabugSampleTests.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/default/ios/InstabugTests/InstabugSampleTests.m b/examples/default/ios/InstabugTests/InstabugSampleTests.m index df2b2914b..b91213a01 100644 --- a/examples/default/ios/InstabugTests/InstabugSampleTests.m +++ b/examples/default/ios/InstabugTests/InstabugSampleTests.m @@ -226,7 +226,7 @@ - (void)testSetReproStepsConfig { [self.instabugBridge setReproStepsConfig:bugMode :crashMode :sessionReplayMode]; OCMVerify([mock setReproStepsFor:IBGIssueTypeBug withMode:bugMode]); - OCMVerify([mock setReproStepsFor:IBGIssueTypeCrash withMode:crashMode]); + OCMVerify([mock setReproStepsFor:IBGIssueTypeAllCrashes withMode:crashMode]); OCMVerify([mock setReproStepsFor:IBGIssueTypeSessionReplay withMode:sessionReplayMode]); } From fc70b2465bb283f86eb7743af278d7c966a82b00 Mon Sep 17 00:00:00 2001 From: ahmed alaa <154802748+ahmedAlaaInstabug@users.noreply.github.com> Date: Wed, 13 Aug 2025 14:23:38 +0300 Subject: [PATCH 24/26] fix: private views --- CHANGELOG.md | 1 - examples/default/ios/Podfile.lock | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 910410990..57b6bb5ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,7 +16,6 @@ - Masking private views on newer React native Versions ([#1403](https://github.com/Instabug/Instabug-React-Native/pull/1403)) - ## [15.0.2](https://github.com/Instabug/Instabug-React-Native/compare/v15.2.0...dev) ### Added diff --git a/examples/default/ios/Podfile.lock b/examples/default/ios/Podfile.lock index 9904b4e51..1107b159a 100644 --- a/examples/default/ios/Podfile.lock +++ b/examples/default/ios/Podfile.lock @@ -2098,6 +2098,6 @@ SPEC CHECKSUMS: SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d Yoga: 055f92ad73f8c8600a93f0e25ac0b2344c3b07e6 -PODFILE CHECKSUM: 837b933596e1616ff02cc206bb17dee4f611fdbc +PODFILE CHECKSUM: 3e9d7ba8bd7dfb7bc3f7ff783b5df8e1f64fb6f5 COCOAPODS: 1.14.0 From 2c01dc5654d0463836c545959bb577a342715de5 Mon Sep 17 00:00:00 2001 From: ahmed alaa <154802748+ahmedAlaaInstabug@users.noreply.github.com> Date: Wed, 13 Aug 2025 14:28:39 +0300 Subject: [PATCH 25/26] fix: private views --- ios/RNInstabug/InstabugReactBridge.m | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/ios/RNInstabug/InstabugReactBridge.m b/ios/RNInstabug/InstabugReactBridge.m index c6c0391d5..fe9e11e8a 100644 --- a/ios/RNInstabug/InstabugReactBridge.m +++ b/ios/RNInstabug/InstabugReactBridge.m @@ -182,13 +182,10 @@ - (dispatch_queue_t)methodQueue { [Instabug setColorTheme:colorTheme]; } -RCT_EXPORT_METHOD(setPrimaryColor:(UIColor *)color) { - Instabug.tintColor = color; -} RCT_EXPORT_METHOD(setTheme:(NSDictionary *)themeConfig) { IBGTheme *theme = [[IBGTheme alloc] init]; - + NSDictionary *colorMapping = @{ @"primaryColor": ^(UIColor *color) { theme.primaryColor = color; }, @"backgroundColor": ^(UIColor *color) { theme.backgroundColor = color; }, @@ -203,7 +200,7 @@ - (dispatch_queue_t)methodQueue { @"selectedRowBackgroundColor": ^(UIColor *color) { theme.selectedRowBackgroundColor = color; }, @"rowSeparatorColor": ^(UIColor *color) { theme.rowSeparatorColor = color; } }; - + for (NSString *key in colorMapping) { if (themeConfig[key]) { NSString *colorString = themeConfig[key]; @@ -214,11 +211,11 @@ - (dispatch_queue_t)methodQueue { } } } - + [self setFontIfPresent:themeConfig[@"primaryFontPath"] forTheme:theme type:@"primary"]; [self setFontIfPresent:themeConfig[@"secondaryFontPath"] forTheme:theme type:@"secondary"]; [self setFontIfPresent:themeConfig[@"ctaFontPath"] forTheme:theme type:@"cta"]; - + Instabug.theme = theme; } @@ -241,12 +238,12 @@ - (void)setFontIfPresent:(NSString *)fontPath forTheme:(IBGTheme *)theme type:(N - (UIColor *)colorFromHexString:(NSString *)hexString { NSString *cleanString = [hexString stringByReplacingOccurrencesOfString:@"#" withString:@""]; - + if (cleanString.length == 6) { unsigned int rgbValue = 0; NSScanner *scanner = [NSScanner scannerWithString:cleanString]; [scanner scanHexInt:&rgbValue]; - + return [UIColor colorWithRed:((rgbValue & 0xFF0000) >> 16) / 255.0 green:((rgbValue & 0xFF00) >> 8) / 255.0 blue:(rgbValue & 0xFF) / 255.0 @@ -255,13 +252,13 @@ - (UIColor *)colorFromHexString:(NSString *)hexString { unsigned int rgbaValue = 0; NSScanner *scanner = [NSScanner scannerWithString:cleanString]; [scanner scanHexInt:&rgbaValue]; - + return [UIColor colorWithRed:((rgbaValue & 0xFF000000) >> 24) / 255.0 green:((rgbaValue & 0xFF0000) >> 16) / 255.0 blue:((rgbaValue & 0xFF00) >> 8) / 255.0 alpha:(rgbaValue & 0xFF) / 255.0]; } - + return [UIColor blackColor]; } From b39fcdab3749ef707e4f5a719936fce8b2630aa8 Mon Sep 17 00:00:00 2001 From: ahmed alaa <154802748+ahmedAlaaInstabug@users.noreply.github.com> Date: Thu, 14 Aug 2025 12:07:20 +0300 Subject: [PATCH 26/26] bump ios SDK to 16.0.1 --- examples/default/ios/Podfile.lock | 8 ++++---- ios/native.rb | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/default/ios/Podfile.lock b/examples/default/ios/Podfile.lock index 1107b159a..d9f1e9e13 100644 --- a/examples/default/ios/Podfile.lock +++ b/examples/default/ios/Podfile.lock @@ -31,7 +31,7 @@ PODS: - hermes-engine (0.75.4): - hermes-engine/Pre-built (= 0.75.4) - hermes-engine/Pre-built (0.75.4) - - Instabug (16.0.0) + - Instabug (16.0.1) - instabug-reactnative-ndk (0.1.0): - DoubleConversion - glog @@ -1626,7 +1626,7 @@ PODS: - ReactCommon/turbomodule/core - Yoga - RNInstabug (16.0.0): - - Instabug (= 16.0.0) + - Instabug (= 16.0.1) - React-Core - RNReanimated (3.16.1): - DoubleConversion @@ -2022,7 +2022,7 @@ SPEC CHECKSUMS: Google-Maps-iOS-Utils: f77eab4c4326d7e6a277f8e23a0232402731913a GoogleMaps: 032f676450ba0779bd8ce16840690915f84e57ac hermes-engine: ea92f60f37dba025e293cbe4b4a548fd26b610a0 - Instabug: b891b31d33e5cd42b69aab21d32684c656bd292e + Instabug: f31a27e70cb6580aef656d1abf8c57a5bb5633d0 instabug-reactnative-ndk: d765ac289d56e8896398d02760d9abf2562fc641 OCMock: 589f2c84dacb1f5aaf6e4cec1f292551fe748e74 RCT-Folly: 4464f4d875961fce86008d45f4ecf6cef6de0740 @@ -2098,6 +2098,6 @@ SPEC CHECKSUMS: SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d Yoga: 055f92ad73f8c8600a93f0e25ac0b2344c3b07e6 -PODFILE CHECKSUM: 3e9d7ba8bd7dfb7bc3f7ff783b5df8e1f64fb6f5 +PODFILE CHECKSUM: 837b933596e1616ff02cc206bb17dee4f611fdbc COCOAPODS: 1.14.0 diff --git a/ios/native.rb b/ios/native.rb index 2be88af4a..6c1848522 100644 --- a/ios/native.rb +++ b/ios/native.rb @@ -1,4 +1,4 @@ -$instabug = { :version => '16.0.0' } +$instabug = { :version => '16.0.1' } def use_instabug! (spec = nil) version = $instabug[:version]