react-native-unistyles 2.8.0-beta.1 → 2.8.0-beta.3

package/ios/platform/Platform_tvOS.mm

@@ -1,7 +1,6 @@
 #if TARGET_OS_TV
 
 #import "Platform_tvOS.h"
-#import "UnistylesRuntime.h"
 #import <React/RCTAppearance.h>
 
 @implementation Platform
@@ -9,15 +8,6 @@
 - (instancetype)init {
     self = [super init];
     if (self) {
-        UIScreen *screen = [UIScreen mainScreen];
-        UIContentSizeCategory contentSizeCategory = [[UIApplication sharedApplication] preferredContentSizeCategory];
-
-        self.initialScreen = {(int)screen.bounds.size.width, (int)screen.bounds.size.height};
-        self.initialColorScheme = [self getColorScheme];
-        self.initialContentSizeCategory = [self getContentSizeCategory:contentSizeCategory];
-        self.initialStatusBar = [self getStatusBarDimensions];
-        self.initialInsets = [self getInsets];
-        
         [self setupListeners];
     }
     return self;
@@ -47,101 +37,49 @@
                                                object:nil];
 }
 
-- (void)onAppearanceChange:(NSNotification *)notification {
-    std::string colorScheme = [self getColorScheme];
+- (void)makeShared:(void*)runtime {
+    self.unistylesRuntime = runtime;
+    
+    auto unistylesRuntime = ((UnistylesRuntime*)self.unistylesRuntime);
+    
+    unistylesRuntime->setScreenDimensionsCallback([self](){
+        return [self getScreenDimensions];
+    });
 
-    if (self.unistylesRuntime != nullptr) {
-        ((UnistylesRuntime*)self.unistylesRuntime)->handleAppearanceChange(colorScheme);
-    }
+    unistylesRuntime->setColorSchemeCallback([](){
+        return getColorScheme();
+    });
+    
+    unistylesRuntime->setContentSizeCategoryCallback([](){
+        return getContentSizeCategory();
+    });
+    
+    dispatch_async(dispatch_get_main_queue(), ^{
+        unistylesRuntime->screen = [self getScreenDimensions];
+        unistylesRuntime->contentSizeCategory = getContentSizeCategory();
+        unistylesRuntime->colorScheme = getColorScheme();
+    });
 }
 
-- (void)onContentSizeCategoryChange:(NSNotification *)notification {
-    UIContentSizeCategory contentSizeCategory = [[UIApplication sharedApplication] preferredContentSizeCategory];
-
+- (void)onAppearanceChange:(NSNotification *)notification {
     if (self.unistylesRuntime != nullptr) {
-        ((UnistylesRuntime*)self.unistylesRuntime)->handleContentSizeCategoryChange([self getContentSizeCategory:contentSizeCategory]);
+        ((UnistylesRuntime*)self.unistylesRuntime)->handleAppearanceChange(getColorScheme());
     }
 }
 
-- (std::string)getColorScheme {
-    UIUserInterfaceStyle colorScheme = [UIScreen mainScreen].traitCollection.userInterfaceStyle;
-
-    switch (colorScheme) {
-        case UIUserInterfaceStyleLight:
-            return UnistylesLightScheme;
-        case UIUserInterfaceStyleDark:
-            return UnistylesDarkScheme;
-        case UIUserInterfaceStyleUnspecified:
-        default:
-            return UnistylesUnspecifiedScheme;
+- (void)onContentSizeCategoryChange:(NSNotification *)notification {
+    if (self.unistylesRuntime != nullptr) {
+        ((UnistylesRuntime*)self.unistylesRuntime)->handleContentSizeCategoryChange(getContentSizeCategory());
     }
 }
 
-- (Insets)getInsets {
-    return {0, 0, 0, 0};
-}
-
-- (Dimensions)getStatusBarDimensions {
-    return {0, 0};
-}
-
-- (Dimensions)getNavigationBarDimensions {
-    return {0, 0};
-}
-
-- (std::string)getContentSizeCategory:(UIContentSizeCategory)contentSizeCategory {
-    if ([contentSizeCategory isEqualToString:UIContentSizeCategoryExtraExtraExtraLarge]) {
-        return std::string([@"xxxLarge" UTF8String]);
-    }
-    
-    if ([contentSizeCategory isEqualToString:UIContentSizeCategoryExtraExtraLarge]) {
-        return std::string([@"xxLarge" UTF8String]);
-    }
-    
-    if ([contentSizeCategory isEqualToString:UIContentSizeCategoryExtraLarge]) {
-        return std::string([@"xLarge" UTF8String]);
-    }
-    
-    if ([contentSizeCategory isEqualToString:UIContentSizeCategoryLarge]) {
-        return std::string([@"Large" UTF8String]);
-    }
-    
-    if ([contentSizeCategory isEqualToString:UIContentSizeCategoryMedium]) {
-        return std::string([@"Medium" UTF8String]);
-    }
-    
-    if ([contentSizeCategory isEqualToString:UIContentSizeCategorySmall]) {
-        return std::string([@"Small" UTF8String]);
-    }
-    
-    if ([contentSizeCategory isEqualToString:UIContentSizeCategoryExtraSmall]) {
-        return std::string([@"xSmall" UTF8String]);
-    }
+- (Dimensions)getScreenDimensions {
+    UIScreen *screen = [UIScreen mainScreen];
+    Dimensions screenDimension = {(int)screen.bounds.size.width, (int)screen.bounds.size.height};
     
-    if ([contentSizeCategory isEqualToString:UIContentSizeCategoryAccessibilityMedium]) {
-        return std::string([@"accessibilityMedium" UTF8String]);
-    }
-    
-    if ([contentSizeCategory isEqualToString:UIContentSizeCategoryAccessibilityLarge]) {
-        return std::string([@"accessibilityLarge" UTF8String]);
-    }
-    
-    if ([contentSizeCategory isEqualToString:UIContentSizeCategoryAccessibilityExtraLarge]) {
-        return std::string([@"accessibilityExtraLarge" UTF8String]);
-    }
-    
-    if ([contentSizeCategory isEqualToString:UIContentSizeCategoryAccessibilityExtraExtraLarge]) {
-        return std::string([@"accessibilityExtraExtraLarge" UTF8String]);
-    }
-    
-    if ([contentSizeCategory isEqualToString:UIContentSizeCategoryAccessibilityExtraExtraExtraLarge]) {
-        return std::string([@"accessibilityExtraExtraExtraLarge" UTF8String]);
-    }
-    
-    return std::string([@"unspecified" UTF8String]);
+    return screenDimension;
 }
 
 @end
 
-
 #endif

package/ios/platform/Platform_visionOS.h

@@ -1,23 +1,17 @@
 #include <string>
 #include <map>
-#include <UnistylesRuntime.h>
 #import <UIKit/UIKit.h>
+#import "Platform_Shared.h"
 
 @interface Platform : NSObject
 
-@property (nonatomic, assign) Dimensions initialScreen;
-@property (nonatomic, assign) std::string initialColorScheme;
-@property (nonatomic, assign) std::string initialContentSizeCategory;
-@property (nonatomic, assign) Insets initialInsets;
-@property (nonatomic, assign) Dimensions initialStatusBar;
-@property (nonatomic, assign) Dimensions initialNavigationBar;
 @property (nonatomic, assign) void* unistylesRuntime;
 
 - (instancetype)init;
 
 - (void)setupListeners;
+- (void)makeShared:(void*)runtime;
 - (UIWindow *)getMainWindow;
-- (std::string)getContentSizeCategory:(UIContentSizeCategory)contentSizeCategory;
 - (void)onContentSizeCategoryChange:(NSNotification *)notification;
 - (void)onWindowChange:(NSNotification *)notification;
 

package/ios/platform/Platform_visionOS.mm

@@ -9,15 +9,6 @@
 - (instancetype)init {
     self = [super init];
     if (self) {
-        UIWindow* mainWindow = [self getMainWindow];
-        UIContentSizeCategory contentSizeCategory = [[UIApplication sharedApplication] preferredContentSizeCategory];
-
-        self.initialScreen = {(int)mainWindow.bounds.size.width, (int)mainWindow.bounds.size.height};
-        self.initialColorScheme = UnistylesUnspecifiedScheme;
-        self.initialContentSizeCategory = [self getContentSizeCategory:contentSizeCategory];
-        self.initialStatusBar = [self getStatusBarDimensions];
-        self.initialInsets = [self getInsets];
-        
         [self setupListeners];
     }
     return self;
@@ -68,97 +59,51 @@
                                                object:nil];
 }
 
-- (void)onWindowChange:(NSNotification *)notification {
-    UIWindow* mainWindow = [self getMainWindow];
+- (void)makeShared:(void*)runtime {
+    self.unistylesRuntime = runtime;
+    
+    auto unistylesRuntime = ((UnistylesRuntime*)self.unistylesRuntime);
+    
+    unistylesRuntime->setScreenDimensionsCallback([self](){
+        return [self getScreenDimensions];
+    });
+    
+    unistylesRuntime->setContentSizeCategoryCallback([](){
+        return getContentSizeCategory();
+    });
+    
+    dispatch_async(dispatch_get_main_queue(), ^{
+        unistylesRuntime->screen = [self getScreenDimensions];
+        unistylesRuntime->contentSizeCategory = getContentSizeCategory();
+    });
+}
 
-    Dimensions screen = {(int)mainWindow.frame.size.width, (int)mainWindow.frame.size.height};
-    Insets insets = [self getInsets];
-    Dimensions statusBar = [self getStatusBarDimensions];
-    Dimensions navigationBar = [self getNavigationBarDimensions];
+- (void)onWindowChange:(NSNotification *)notification {
+    Dimensions screen = [self getScreenDimensions];
 
     if (self.unistylesRuntime != nullptr) {
         ((UnistylesRuntime*)self.unistylesRuntime)->handleScreenSizeChange(
            screen,
-           insets,
-           statusBar,
-           navigationBar
+           std::nullopt,
+           std::nullopt,
+           std::nullopt
         );
     }
 }
 
 - (void)onContentSizeCategoryChange:(NSNotification *)notification {
-    UIContentSizeCategory contentSizeCategory = [[UIApplication sharedApplication] preferredContentSizeCategory];
-
     if (self.unistylesRuntime != nullptr) {
-        ((UnistylesRuntime*)self.unistylesRuntime)->handleContentSizeCategoryChange([self getContentSizeCategory:contentSizeCategory]);
+        ((UnistylesRuntime*)self.unistylesRuntime)->handleContentSizeCategoryChange(getContentSizeCategory());
     }
 }
 
-- (Insets)getInsets {
-    return {0, 0, 0, 0};
-}
-
-- (Dimensions)getStatusBarDimensions {
-    return {0, 0};
-}
-
-- (Dimensions)getNavigationBarDimensions {
-    return {0, 0};
-}
-
-- (std::string)getContentSizeCategory:(UIContentSizeCategory)contentSizeCategory {
-    if ([contentSizeCategory isEqualToString:UIContentSizeCategoryExtraExtraExtraLarge]) {
-        return std::string([@"xxxLarge" UTF8String]);
-    }
-    
-    if ([contentSizeCategory isEqualToString:UIContentSizeCategoryExtraExtraLarge]) {
-        return std::string([@"xxLarge" UTF8String]);
-    }
-    
-    if ([contentSizeCategory isEqualToString:UIContentSizeCategoryExtraLarge]) {
-        return std::string([@"xLarge" UTF8String]);
-    }
-    
-    if ([contentSizeCategory isEqualToString:UIContentSizeCategoryLarge]) {
-        return std::string([@"Large" UTF8String]);
-    }
-    
-    if ([contentSizeCategory isEqualToString:UIContentSizeCategoryMedium]) {
-        return std::string([@"Medium" UTF8String]);
-    }
-    
-    if ([contentSizeCategory isEqualToString:UIContentSizeCategorySmall]) {
-        return std::string([@"Small" UTF8String]);
-    }
-    
-    if ([contentSizeCategory isEqualToString:UIContentSizeCategoryExtraSmall]) {
-        return std::string([@"xSmall" UTF8String]);
-    }
-    
-    if ([contentSizeCategory isEqualToString:UIContentSizeCategoryAccessibilityMedium]) {
-        return std::string([@"accessibilityMedium" UTF8String]);
-    }
-    
-    if ([contentSizeCategory isEqualToString:UIContentSizeCategoryAccessibilityLarge]) {
-        return std::string([@"accessibilityLarge" UTF8String]);
-    }
-    
-    if ([contentSizeCategory isEqualToString:UIContentSizeCategoryAccessibilityExtraLarge]) {
-        return std::string([@"accessibilityExtraLarge" UTF8String]);
-    }
-    
-    if ([contentSizeCategory isEqualToString:UIContentSizeCategoryAccessibilityExtraExtraLarge]) {
-        return std::string([@"accessibilityExtraExtraLarge" UTF8String]);
-    }
-    
-    if ([contentSizeCategory isEqualToString:UIContentSizeCategoryAccessibilityExtraExtraExtraLarge]) {
-        return std::string([@"accessibilityExtraExtraExtraLarge" UTF8String]);
-    }
+- (Dimensions)getScreenDimensions {
+    UIWindow* mainWindow = [self getMainWindow];
+    Dimensions screenDimension = {(int)mainWindow.frame.size.width, (int)mainWindow.frame.size.height};
     
-    return std::string([@"unspecified" UTF8String]);
+    return screenDimension;
 }
 
 @end
 
-
 #endif

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-unistyles",
-  "version": "2.8.0-beta.1",
+  "version": "2.8.0-beta.3",
   "description": "Level up your React Native StyleSheet",
   "scripts": {
     "test": "jest",

package/react-native-unistyles.podspec

@@ -17,6 +17,9 @@ Pod::Spec.new do |s|
     "ios/**/*.{h,mm}",
     "cxx/*.{h,cpp}"
   ]
+  s.pod_target_xcconfig = {
+    "CLANG_CXX_LANGUAGE_STANDARD" => "c++20"
+  }
 
   install_modules_dependencies(s)
 end

package/android/src/main/java/com/unistyles/Config.kt

@@ -1,116 +0,0 @@
-package com.unistyles
-
-import android.annotation.SuppressLint
-import android.content.res.Configuration
-import com.facebook.react.bridge.ReactApplicationContext
-
-class UnistylesConfig(private val reactApplicationContext: ReactApplicationContext) {
-    private val insets: UnistylesInsets = UnistylesInsets(reactApplicationContext)
-    private val density: Float = reactApplicationContext.resources.displayMetrics.density
-    private var lastConfig: Config = this.getAppConfig()
-    private var lastLayoutConfig: LayoutConfig = this.getAppLayoutConfig()
-
-    fun hasNewConfig(): Boolean {
-        val newConfig = this.getAppConfig()
-        val newContentSizeCategory = newConfig.contentSizeCategory != lastConfig.contentSizeCategory
-        val newColorScheme = newConfig.colorScheme != lastConfig.colorScheme
-
-        if (!newContentSizeCategory && !newColorScheme) {
-            return false
-        }
-
-        lastConfig = newConfig
-        lastConfig.hasNewContentSizeCategory = newContentSizeCategory
-        lastConfig.hasNewColorScheme = newColorScheme
-
-        return true
-    }
-
-    fun hasNewLayoutConfig(): Boolean {
-        val newConfig = this.getAppLayoutConfig()
-
-        if (newConfig.isEqual(lastLayoutConfig)) {
-            return false
-        }
-
-        lastLayoutConfig = newConfig
-
-        return true
-    }
-
-    fun getConfig(): Config {
-        return this.lastConfig
-    }
-
-    fun getLayoutConfig(): LayoutConfig {
-        return this.lastLayoutConfig
-    }
-
-    private fun getAppConfig(): Config {
-        val fontScale = reactApplicationContext.resources.configuration.fontScale
-
-        return Config(
-            this.getColorScheme(),
-            this.getContentSizeCategory(fontScale),
-        )
-    }
-
-    private fun getAppLayoutConfig(): LayoutConfig {
-        val displayMetrics = reactApplicationContext.resources.displayMetrics
-        val screenWidth = (displayMetrics.widthPixels / density).toInt()
-        val screenHeight = (displayMetrics.heightPixels / density).toInt()
-
-        return LayoutConfig(
-            Dimensions(screenWidth, screenHeight),
-            this.insets.get(),
-            Dimensions(screenWidth, getStatusBarHeight()),
-            Dimensions(screenWidth, getNavigationBarHeight())
-        )
-    }
-
-    private fun getContentSizeCategory(fontScale: Float): String {
-        val contentSizeCategory = when {
-            fontScale <= 0.85f -> "Small"
-            fontScale <= 1.0f -> "Default"
-            fontScale <= 1.15f -> "Large"
-            fontScale <= 1.3f -> "ExtraLarge"
-            fontScale <= 1.5f -> "Huge"
-            fontScale <= 1.8 -> "ExtraHuge"
-            else -> "ExtraExtraHuge"
-        }
-
-        return contentSizeCategory
-    }
-
-    private fun getColorScheme(): String {
-        val colorScheme = when (reactApplicationContext.resources.configuration.uiMode.and(Configuration.UI_MODE_NIGHT_MASK)) {
-            Configuration.UI_MODE_NIGHT_YES -> "dark"
-            Configuration.UI_MODE_NIGHT_NO -> "light"
-            else -> "unspecified"
-        }
-
-        return colorScheme
-    }
-
-    @SuppressLint("InternalInsetResource", "DiscouragedApi")
-    private fun getStatusBarHeight(): Int {
-        val heightResId = reactApplicationContext.resources.getIdentifier("status_bar_height", "dimen", "android")
-
-        if (heightResId > 0) {
-            return (reactApplicationContext.resources.getDimensionPixelSize(heightResId) / density).toInt()
-        }
-
-        return 0
-    }
-
-    @SuppressLint("InternalInsetResource", "DiscouragedApi")
-    private fun getNavigationBarHeight(): Int {
-        val heightResId = reactApplicationContext.resources.getIdentifier("navigation_bar_height", "dimen", "android")
-
-        if (heightResId > 0) {
-            return (reactApplicationContext.resources.getDimensionPixelSize(heightResId) / density).toInt()
-        }
-
-        return 0
-    }
-}

package/android/src/main/java/com/unistyles/Insets.kt

@@ -1,141 +0,0 @@
-package com.unistyles
-
-import android.content.Context
-import android.graphics.Rect
-import android.os.Build
-import android.view.View
-import android.view.Window
-import android.view.WindowInsets
-import android.view.WindowManager
-import com.facebook.react.bridge.ReactApplicationContext
-import kotlin.math.roundToInt
-
-class UnistylesInsets(private val reactApplicationContext: ReactApplicationContext) {
-    private val density: Float = reactApplicationContext.resources.displayMetrics.density
-
-    fun get(): Insets {
-        return this.getCurrentInsets()
-    }
-
-    private fun getCurrentInsets(): Insets {
-        val baseInsets = this.getBaseInsets()
-        val statusBarTranslucent = this.hasTranslucentStatusBar() ?: return baseInsets
-        val window = reactApplicationContext.currentActivity?.window ?: return baseInsets
-        val shouldModifyLandscapeInsets = this.forceLandscapeInsets(baseInsets, window)
-
-        val topInset = this.getTopInset(baseInsets, statusBarTranslucent, window)
-        val bottomInset = this.getBottomInset(baseInsets, window)
-        val leftInset = if (shouldModifyLandscapeInsets) 0 else baseInsets.left
-        val rightInset = if (shouldModifyLandscapeInsets) 0 else baseInsets.right
-
-        return Insets(topInset, bottomInset, leftInset, rightInset)
-    }
-
-    @Suppress("DEPRECATION")
-    private fun getBaseInsets(): Insets {
-        // this is the best API, but it's available from Android 11
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            val windowManager = reactApplicationContext.getSystemService(Context.WINDOW_SERVICE) as WindowManager
-            val systemBarsInsets = windowManager.currentWindowMetrics.windowInsets.getInsets(WindowInsets.Type.systemBars())
-
-            val top = (systemBarsInsets.top / density).roundToInt()
-            val bottom = (systemBarsInsets.bottom / density).roundToInt()
-            val left = (systemBarsInsets.left / density).roundToInt()
-            val right = (systemBarsInsets.right / density).roundToInt()
-
-            return Insets(top, bottom, left, right)
-        }
-
-        // available from Android 6.0
-        val window = reactApplicationContext.currentActivity?.window ?: return Insets(0, 0, 0, 0)
-        val systemInsets = window.decorView.rootWindowInsets ?: return Insets(0, 0, 0, 0)
-
-        val top = (systemInsets.systemWindowInsetTop / density).roundToInt()
-        val bottom = (systemInsets.systemWindowInsetBottom / density).roundToInt()
-        val left = (systemInsets.systemWindowInsetLeft / density).roundToInt()
-        val right = (systemInsets.systemWindowInsetRight / density).roundToInt()
-
-        return Insets(top, bottom, left, right)
-    }
-
-    // this function helps to detect statusBar translucent, as React Native is using weird API instead of windows flags
-    private fun hasTranslucentStatusBar(): Boolean? {
-        val window = reactApplicationContext.currentActivity?.window ?: return null
-        val contentView = window.decorView.findViewById<View>(android.R.id.content) ?: return null
-        val decorViewLocation = IntArray(2)
-        val contentViewLocation = IntArray(2)
-
-        // decor view is a top level view with navigationBar and statusBar
-        window.decorView.getLocationOnScreen(decorViewLocation)
-        // content view is view without navigationBar and statusBar
-        contentView.getLocationOnScreen(contentViewLocation)
-
-        val statusBarHeight = contentViewLocation[1] - decorViewLocation[1]
-
-        // if positions are the same, then the status bar is translucent
-        return statusBarHeight == 0
-    }
-
-    private fun getTopInset(baseInsets: Insets, statusBarTranslucent: Boolean, window: Window): Int {
-        if (!statusBarTranslucent) {
-            return 0
-        }
-
-        return baseInsets.top
-    }
-
-    @Suppress("DEPRECATION")
-    private fun getBottomInset(baseInsets: Insets, window: Window): Int {
-        val translucentNavigation = hasTranslucentNavigation(window)
-        val fullScreenMode = hasFullScreenMode(window)
-
-        // Android 11 has inconsistent FLAG_LAYOUT_NO_LIMITS, which alone does nothing
-        // https://stackoverflow.com/questions/64153785/android-11-window-setdecorfitssystemwindow-doesnt-show-screen-behind-status-a
-        if (Build.VERSION.SDK_INT == Build.VERSION_CODES.R) {
-            if ((fullScreenMode && translucentNavigation) || translucentNavigation) {
-                return baseInsets.bottom
-            }
-
-            return 0
-        }
-
-        return if (translucentNavigation || fullScreenMode) baseInsets.bottom else 0
-    }
-
-    private fun forceLandscapeInsets(baseInsets: Insets, window: Window): Boolean {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            return false
-        }
-
-        val displayMetrics = reactApplicationContext.resources.displayMetrics
-        val isLandscape = displayMetrics.widthPixels > displayMetrics.heightPixels
-
-        if (!isLandscape) {
-            return false
-        }
-
-        val contentView = window.decorView.findViewById<View>(android.R.id.content) ?: return false
-        val visibleRect = Rect()
-        val drawingRect = Rect()
-
-        window.decorView.getGlobalVisibleRect(visibleRect)
-        contentView.getDrawingRect(drawingRect)
-
-        // width is equal to navigationBarHeight + statusBarHeight (in landscape)
-        val width = ((visibleRect.width() - contentView.width) / density).roundToInt()
-
-        // we should correct landscape if insets are equal to width
-        return (baseInsets.left + baseInsets.right) == width
-    }
-
-    @Suppress("DEPRECATION")
-    private fun hasTranslucentNavigation(window: Window): Boolean {
-        return (window.attributes.flags and WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION) == WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION
-    }
-
-    private fun hasFullScreenMode(window: Window): Boolean {
-        val decorFitsSystemWindows = window.decorView.fitsSystemWindows
-
-        return (window.attributes.flags and WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS) == WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS || !decorFitsSystemWindows
-    }
-}

package/ios/UnistylesHelpers.h

@@ -1,3 +0,0 @@
-#include <string>
-
-NSString* cxxStringToNSString(std::string);

package/ios/UnistylesHelpers.mm

@@ -1,5 +0,0 @@
-#import "UnistylesHelpers.h"
-
-NSString* cxxStringToNSString(std::string cxxString) {
-    return [NSString stringWithUTF8String:cxxString.c_str()];
-}