react-native-tvos 0.74.5-0 → 0.75.2-0rc0

package/ReactAndroid/src/main/java/com/facebook/react/modules/image/ImageLoaderModule.java

@@ -1,319 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-package com.facebook.react.modules.image;
-
-import android.net.Uri;
-import android.text.TextUtils;
-import android.util.SparseArray;
-import androidx.annotation.Nullable;
-import com.facebook.common.executors.CallerThreadExecutor;
-import com.facebook.common.references.CloseableReference;
-import com.facebook.datasource.BaseDataSubscriber;
-import com.facebook.datasource.DataSource;
-import com.facebook.datasource.DataSubscriber;
-import com.facebook.drawee.backends.pipeline.Fresco;
-import com.facebook.fbreact.specs.NativeImageLoaderAndroidSpec;
-import com.facebook.imagepipeline.core.ImagePipeline;
-import com.facebook.imagepipeline.image.CloseableImage;
-import com.facebook.imagepipeline.request.ImageRequest;
-import com.facebook.imagepipeline.request.ImageRequestBuilder;
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.GuardedAsyncTask;
-import com.facebook.react.bridge.LifecycleEventListener;
-import com.facebook.react.bridge.Promise;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.module.annotations.ReactModule;
-import com.facebook.react.modules.fresco.ReactNetworkImageRequest;
-import com.facebook.react.views.image.ReactCallerContextFactory;
-import com.facebook.react.views.imagehelper.ImageSource;
-
-@ReactModule(name = NativeImageLoaderAndroidSpec.NAME)
-public class ImageLoaderModule extends NativeImageLoaderAndroidSpec
-    implements LifecycleEventListener {
-
-  private static final String ERROR_INVALID_URI = "E_INVALID_URI";
-  private static final String ERROR_PREFETCH_FAILURE = "E_PREFETCH_FAILURE";
-  private static final String ERROR_GET_SIZE_FAILURE = "E_GET_SIZE_FAILURE";
-
-  private @Nullable final Object mCallerContext;
-  private final Object mEnqueuedRequestMonitor = new Object();
-  private final SparseArray<DataSource<Void>> mEnqueuedRequests = new SparseArray<>();
-  private @Nullable ImagePipeline mImagePipeline = null;
-  private @Nullable ReactCallerContextFactory mCallerContextFactory;
-
-  public ImageLoaderModule(ReactApplicationContext reactContext) {
-    super(reactContext);
-    mCallerContext = this;
-  }
-
-  public ImageLoaderModule(ReactApplicationContext reactContext, Object callerContext) {
-    super(reactContext);
-    mCallerContext = callerContext;
-  }
-
-  public ImageLoaderModule(
-      ReactApplicationContext reactContext,
-      ImagePipeline imagePipeline,
-      ReactCallerContextFactory callerContextFactory) {
-    super(reactContext);
-    mCallerContextFactory = callerContextFactory;
-    mImagePipeline = imagePipeline;
-    mCallerContext = null;
-  }
-
-  private @Nullable Object getCallerContext() {
-    return mCallerContextFactory != null
-        ? mCallerContextFactory.getOrCreateCallerContext("", "")
-        : mCallerContext;
-  }
-
-  private ImagePipeline getImagePipeline() {
-    return mImagePipeline != null ? mImagePipeline : Fresco.getImagePipeline();
-  }
-
-  /**
-   * Fetch the width and height of the given image.
-   *
-   * @param uriString the URI of the remote image
-   * @param promise the promise that is fulfilled when operation successfully completed or rejected
-   *     when there is an error
-   */
-  @ReactMethod
-  public void getSize(final String uriString, final Promise promise) {
-    if (uriString == null || uriString.isEmpty()) {
-      promise.reject(ERROR_INVALID_URI, "Cannot get the size of an image for an empty URI");
-      return;
-    }
-
-    ImageSource source = new ImageSource(getReactApplicationContext(), uriString);
-    ImageRequest request = ImageRequestBuilder.newBuilderWithSource(source.getUri()).build();
-
-    DataSource<CloseableReference<CloseableImage>> dataSource =
-        getImagePipeline().fetchDecodedImage(request, getCallerContext());
-
-    DataSubscriber<CloseableReference<CloseableImage>> dataSubscriber =
-        new BaseDataSubscriber<CloseableReference<CloseableImage>>() {
-          @Override
-          protected void onNewResultImpl(
-              DataSource<CloseableReference<CloseableImage>> dataSource) {
-            if (!dataSource.isFinished()) {
-              return;
-            }
-            CloseableReference<CloseableImage> ref = dataSource.getResult();
-            if (ref != null) {
-              try {
-                CloseableImage image = ref.get();
-
-                WritableMap sizes = Arguments.createMap();
-                sizes.putInt("width", image.getWidth());
-                sizes.putInt("height", image.getHeight());
-
-                promise.resolve(sizes);
-              } catch (Exception e) {
-                promise.reject(ERROR_GET_SIZE_FAILURE, e);
-              } finally {
-                CloseableReference.closeSafely(ref);
-              }
-            } else {
-              promise.reject(ERROR_GET_SIZE_FAILURE);
-            }
-          }
-
-          @Override
-          protected void onFailureImpl(DataSource<CloseableReference<CloseableImage>> dataSource) {
-            promise.reject(ERROR_GET_SIZE_FAILURE, dataSource.getFailureCause());
-          }
-        };
-    dataSource.subscribe(dataSubscriber, CallerThreadExecutor.getInstance());
-  }
-
-  /**
-   * Fetch the width and height of the given image with headers.
-   *
-   * @param uriString the URI of the remote image
-   * @param headers headers send with the request
-   * @param promise the promise that is fulfilled when operation successfully completed or rejected
-   *     when there is an error
-   */
-  @ReactMethod
-  public void getSizeWithHeaders(
-      final String uriString, final ReadableMap headers, final Promise promise) {
-    if (uriString == null || uriString.isEmpty()) {
-      promise.reject(ERROR_INVALID_URI, "Cannot get the size of an image for an empty URI");
-      return;
-    }
-
-    ImageSource source = new ImageSource(getReactApplicationContext(), uriString);
-    ImageRequestBuilder imageRequestBuilder =
-        ImageRequestBuilder.newBuilderWithSource(source.getUri());
-    ImageRequest request =
-        ReactNetworkImageRequest.fromBuilderWithHeaders(imageRequestBuilder, headers);
-
-    DataSource<CloseableReference<CloseableImage>> dataSource =
-        getImagePipeline().fetchDecodedImage(request, getCallerContext());
-
-    DataSubscriber<CloseableReference<CloseableImage>> dataSubscriber =
-        new BaseDataSubscriber<CloseableReference<CloseableImage>>() {
-          @Override
-          protected void onNewResultImpl(
-              DataSource<CloseableReference<CloseableImage>> dataSource) {
-            if (!dataSource.isFinished()) {
-              return;
-            }
-            CloseableReference<CloseableImage> ref = dataSource.getResult();
-            if (ref != null) {
-              try {
-                CloseableImage image = ref.get();
-
-                WritableMap sizes = Arguments.createMap();
-                sizes.putInt("width", image.getWidth());
-                sizes.putInt("height", image.getHeight());
-
-                promise.resolve(sizes);
-              } catch (Exception e) {
-                promise.reject(ERROR_GET_SIZE_FAILURE, e);
-              } finally {
-                CloseableReference.closeSafely(ref);
-              }
-            } else {
-              promise.reject(ERROR_GET_SIZE_FAILURE);
-            }
-          }
-
-          @Override
-          protected void onFailureImpl(DataSource<CloseableReference<CloseableImage>> dataSource) {
-            promise.reject(ERROR_GET_SIZE_FAILURE, dataSource.getFailureCause());
-          }
-        };
-    dataSource.subscribe(dataSubscriber, CallerThreadExecutor.getInstance());
-  }
-
-  /**
-   * Prefetches the given image to the Fresco image disk cache.
-   *
-   * @param uriString the URI of the remote image to prefetch
-   * @param requestIdAsDouble the client-supplied request ID used to identify this request
-   * @param promise the promise that is fulfilled when the image is successfully prefetched or
-   *     rejected when there is an error
-   */
-  @Override
-  public void prefetchImage(
-      final String uriString, final double requestIdAsDouble, final Promise promise) {
-    final int requestId = (int) requestIdAsDouble;
-
-    if (uriString == null || uriString.isEmpty()) {
-      promise.reject(ERROR_INVALID_URI, "Cannot prefetch an image for an empty URI");
-      return;
-    }
-
-    Uri uri = Uri.parse(uriString);
-    ImageRequest request = ImageRequestBuilder.newBuilderWithSource(uri).build();
-
-    DataSource<Void> prefetchSource =
-        getImagePipeline().prefetchToDiskCache(request, getCallerContext());
-    DataSubscriber<Void> prefetchSubscriber =
-        new BaseDataSubscriber<Void>() {
-          @Override
-          protected void onNewResultImpl(DataSource<Void> dataSource) {
-            if (!dataSource.isFinished()) {
-              return;
-            }
-            try {
-              removeRequest(requestId);
-              promise.resolve(true);
-            } catch (Exception e) {
-              promise.reject(ERROR_PREFETCH_FAILURE, e);
-            } finally {
-              dataSource.close();
-            }
-          }
-
-          @Override
-          protected void onFailureImpl(DataSource<Void> dataSource) {
-            try {
-              removeRequest(requestId);
-              promise.reject(ERROR_PREFETCH_FAILURE, dataSource.getFailureCause());
-            } finally {
-              dataSource.close();
-            }
-          }
-        };
-    registerRequest(requestId, prefetchSource);
-    prefetchSource.subscribe(prefetchSubscriber, CallerThreadExecutor.getInstance());
-  }
-
-  @Override
-  public void abortRequest(double requestId) {
-    DataSource<Void> request = removeRequest((int) requestId);
-    if (request != null) {
-      request.close();
-    }
-  }
-
-  @ReactMethod
-  public void queryCache(final ReadableArray uris, final Promise promise) {
-    // perform cache interrogation in async task as disk cache checks are expensive
-    new GuardedAsyncTask<Void, Void>(getReactApplicationContext()) {
-      @Override
-      protected void doInBackgroundGuarded(Void... params) {
-        WritableMap result = Arguments.createMap();
-        ImagePipeline imagePipeline = getImagePipeline();
-        for (int i = 0; i < uris.size(); i++) {
-          String uriString = uris.getString(i);
-          if (!TextUtils.isEmpty(uriString)) {
-            final Uri uri = Uri.parse(uriString);
-            if (imagePipeline.isInBitmapMemoryCache(uri)) {
-              result.putString(uriString, "memory");
-            } else if (imagePipeline.isInDiskCacheSync(uri)) {
-              result.putString(uriString, "disk");
-            }
-          }
-        }
-        promise.resolve(result);
-      }
-    }.executeOnExecutor(GuardedAsyncTask.THREAD_POOL_EXECUTOR);
-  }
-
-  private void registerRequest(int requestId, DataSource<Void> request) {
-    synchronized (mEnqueuedRequestMonitor) {
-      mEnqueuedRequests.put(requestId, request);
-    }
-  }
-
-  private @Nullable DataSource<Void> removeRequest(int requestId) {
-    synchronized (mEnqueuedRequestMonitor) {
-      DataSource<Void> request = mEnqueuedRequests.get(requestId);
-      mEnqueuedRequests.remove(requestId);
-      return request;
-    }
-  }
-
-  @Override
-  public void onHostResume() {}
-
-  @Override
-  public void onHostPause() {}
-
-  @Override
-  public void onHostDestroy() {
-    // cancel all requests
-    synchronized (mEnqueuedRequestMonitor) {
-      for (int i = 0, size = mEnqueuedRequests.size(); i < size; i++) {
-        @Nullable DataSource<Void> enqueuedRequest = mEnqueuedRequests.valueAt(i);
-        if (enqueuedRequest != null) {
-          enqueuedRequest.close();
-        }
-      }
-      mEnqueuedRequests.clear();
-    }
-  }
-}

package/ReactAndroid/src/main/java/com/facebook/react/modules/share/ShareModule.java

@@ -1,75 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-package com.facebook.react.modules.share;
-
-import android.app.Activity;
-import android.content.Intent;
-import com.facebook.fbreact.specs.NativeShareModuleSpec;
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.Promise;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.module.annotations.ReactModule;
-
-/** Intent module. Launch other activities or open URLs. */
-@ReactModule(name = NativeShareModuleSpec.NAME)
-public class ShareModule extends NativeShareModuleSpec {
-
-  /* package */ static final String ACTION_SHARED = "sharedAction";
-  /* package */ static final String ERROR_INVALID_CONTENT = "E_INVALID_CONTENT";
-  /* package */ static final String ERROR_UNABLE_TO_OPEN_DIALOG = "E_UNABLE_TO_OPEN_DIALOG";
-
-  public ShareModule(ReactApplicationContext reactContext) {
-    super(reactContext);
-  }
-
-  /**
-   * Open a chooser dialog to send text content to other apps.
-   *
-   * <p>Refer http://developer.android.com/intl/ko/training/sharing/send.html
-   *
-   * @param content the data to send
-   * @param dialogTitle the title of the chooser dialog
-   */
-  @Override
-  public void share(ReadableMap content, String dialogTitle, Promise promise) {
-    if (content == null) {
-      promise.reject(ERROR_INVALID_CONTENT, "Content cannot be null");
-      return;
-    }
-
-    try {
-      Intent intent = new Intent(Intent.ACTION_SEND);
-      intent.setTypeAndNormalize("text/plain");
-
-      if (content.hasKey("title")) {
-        intent.putExtra(Intent.EXTRA_SUBJECT, content.getString("title"));
-      }
-
-      if (content.hasKey("message")) {
-        intent.putExtra(Intent.EXTRA_TEXT, content.getString("message"));
-      }
-
-      Intent chooser = Intent.createChooser(intent, dialogTitle);
-      chooser.addCategory(Intent.CATEGORY_DEFAULT);
-
-      Activity currentActivity = getCurrentActivity();
-      if (currentActivity != null) {
-        currentActivity.startActivity(chooser);
-      } else {
-        getReactApplicationContext().startActivity(chooser);
-      }
-      WritableMap result = Arguments.createMap();
-      result.putString("action", ACTION_SHARED);
-      promise.resolve(result);
-    } catch (Exception e) {
-      promise.reject(ERROR_UNABLE_TO_OPEN_DIALOG, "Failed to open share dialog");
-    }
-  }
-}

package/ReactAndroid/src/main/java/com/facebook/react/modules/sound/SoundManagerModule.java

@@ -1,33 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-package com.facebook.react.modules.sound;
-
-import android.content.Context;
-import android.media.AudioManager;
-import com.facebook.fbreact.specs.NativeSoundManagerSpec;
-import com.facebook.react.bridge.NativeModule;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.module.annotations.ReactModule;
-
-/** {@link NativeModule} that allows Playing device sounds from JS. */
-@ReactModule(name = NativeSoundManagerSpec.NAME)
-public class SoundManagerModule extends NativeSoundManagerSpec {
-
-  public SoundManagerModule(ReactApplicationContext reactContext) {
-    super(reactContext);
-  }
-
-  @Override
-  public void playTouchSound() {
-    AudioManager audioManager =
-        (AudioManager) getReactApplicationContext().getSystemService(Context.AUDIO_SERVICE);
-    if (audioManager != null) {
-      audioManager.playSoundEffect(AudioManager.FX_KEY_CLICK);
-    }
-  }
-}

package/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/StatusBarModule.java

@@ -1,210 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-package com.facebook.react.modules.statusbar;
-
-import android.animation.ArgbEvaluator;
-import android.animation.ValueAnimator;
-import android.annotation.TargetApi;
-import android.app.Activity;
-import android.content.Context;
-import android.os.Build;
-import android.view.View;
-import android.view.WindowInsets;
-import android.view.WindowInsetsController;
-import android.view.WindowManager;
-import androidx.annotation.Nullable;
-import androidx.core.view.ViewCompat;
-import com.facebook.common.logging.FLog;
-import com.facebook.fbreact.specs.NativeStatusBarManagerAndroidSpec;
-import com.facebook.react.bridge.GuardedRunnable;
-import com.facebook.react.bridge.NativeModule;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.UiThreadUtil;
-import com.facebook.react.common.MapBuilder;
-import com.facebook.react.common.ReactConstants;
-import com.facebook.react.module.annotations.ReactModule;
-import com.facebook.react.uimanager.PixelUtil;
-import java.util.Map;
-
-/** {@link NativeModule} that allows changing the appearance of the status bar. */
-@ReactModule(name = NativeStatusBarManagerAndroidSpec.NAME)
-public class StatusBarModule extends NativeStatusBarManagerAndroidSpec {
-
-  private static final String HEIGHT_KEY = "HEIGHT";
-  private static final String DEFAULT_BACKGROUND_COLOR_KEY = "DEFAULT_BACKGROUND_COLOR";
-  public static final String NAME = "StatusBarManager";
-
-  public StatusBarModule(ReactApplicationContext reactContext) {
-    super(reactContext);
-  }
-
-  @Override
-  public @Nullable Map<String, Object> getTypedExportedConstants() {
-    final Context context = getReactApplicationContext();
-    final Activity activity = getCurrentActivity();
-
-    final int heightResId =
-        context.getResources().getIdentifier("status_bar_height", "dimen", "android");
-    final float height =
-        heightResId > 0
-            ? PixelUtil.toDIPFromPixel(context.getResources().getDimensionPixelSize(heightResId))
-            : 0;
-    String statusBarColorString = "black";
-
-    if (activity != null) {
-      final int statusBarColor = activity.getWindow().getStatusBarColor();
-      statusBarColorString = String.format("#%06X", (0xFFFFFF & statusBarColor));
-    }
-
-    return MapBuilder.<String, Object>of(
-        HEIGHT_KEY, height, DEFAULT_BACKGROUND_COLOR_KEY, statusBarColorString);
-  }
-
-  @Override
-  public void setColor(final double colorDouble, final boolean animated) {
-    final int color = (int) colorDouble;
-
-    final Activity activity = getCurrentActivity();
-    if (activity == null) {
-      FLog.w(
-          ReactConstants.TAG,
-          "StatusBarModule: Ignored status bar change, current activity is null.");
-      return;
-    }
-
-    UiThreadUtil.runOnUiThread(
-        new GuardedRunnable(getReactApplicationContext()) {
-          @Override
-          public void runGuarded() {
-            activity
-                .getWindow()
-                .addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
-            if (animated) {
-              int curColor = activity.getWindow().getStatusBarColor();
-              ValueAnimator colorAnimation =
-                  ValueAnimator.ofObject(new ArgbEvaluator(), curColor, color);
-
-              colorAnimation.addUpdateListener(
-                  new ValueAnimator.AnimatorUpdateListener() {
-                    @Override
-                    public void onAnimationUpdate(ValueAnimator animator) {
-                      activity.getWindow().setStatusBarColor((Integer) animator.getAnimatedValue());
-                    }
-                  });
-              colorAnimation.setDuration(300).setStartDelay(0);
-              colorAnimation.start();
-            } else {
-              activity.getWindow().setStatusBarColor(color);
-            }
-          }
-        });
-  }
-
-  @Override
-  public void setTranslucent(final boolean translucent) {
-    final Activity activity = getCurrentActivity();
-    if (activity == null) {
-      FLog.w(
-          ReactConstants.TAG,
-          "StatusBarModule: Ignored status bar change, current activity is null.");
-      return;
-    }
-
-    UiThreadUtil.runOnUiThread(
-        new GuardedRunnable(getReactApplicationContext()) {
-          @Override
-          public void runGuarded() {
-            // If the status bar is translucent hook into the window insets calculations
-            // and consume all the top insets so no padding will be added under the status bar.
-            View decorView = activity.getWindow().getDecorView();
-            if (translucent) {
-              decorView.setOnApplyWindowInsetsListener(
-                  new View.OnApplyWindowInsetsListener() {
-                    @Override
-                    public WindowInsets onApplyWindowInsets(View v, WindowInsets insets) {
-                      WindowInsets defaultInsets = v.onApplyWindowInsets(insets);
-                      return defaultInsets.replaceSystemWindowInsets(
-                          defaultInsets.getSystemWindowInsetLeft(),
-                          0,
-                          defaultInsets.getSystemWindowInsetRight(),
-                          defaultInsets.getSystemWindowInsetBottom());
-                    }
-                  });
-            } else {
-              decorView.setOnApplyWindowInsetsListener(null);
-            }
-
-            ViewCompat.requestApplyInsets(decorView);
-          }
-        });
-  }
-
-  @Override
-  public void setHidden(final boolean hidden) {
-    final Activity activity = getCurrentActivity();
-    if (activity == null) {
-      FLog.w(
-          ReactConstants.TAG,
-          "StatusBarModule: Ignored status bar change, current activity is null.");
-      return;
-    }
-    UiThreadUtil.runOnUiThread(
-        new Runnable() {
-          @Override
-          public void run() {
-            if (hidden) {
-              activity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
-              activity.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN);
-            } else {
-              activity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN);
-              activity.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
-            }
-          }
-        });
-  }
-
-  @Override
-  public void setStyle(@Nullable final String style) {
-    final Activity activity = getCurrentActivity();
-    if (activity == null) {
-      FLog.w(
-          ReactConstants.TAG,
-          "StatusBarModule: Ignored status bar change, current activity is null.");
-      return;
-    }
-
-    UiThreadUtil.runOnUiThread(
-        new Runnable() {
-          @TargetApi(Build.VERSION_CODES.R)
-          @Override
-          public void run() {
-            if (Build.VERSION.SDK_INT > Build.VERSION_CODES.R) {
-              WindowInsetsController insetsController = activity.getWindow().getInsetsController();
-              if ("dark-content".equals(style)) {
-                // dark-content means dark icons on a light status bar
-                insetsController.setSystemBarsAppearance(
-                    WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS,
-                    WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS);
-              } else {
-                insetsController.setSystemBarsAppearance(
-                    0, WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS);
-              }
-            } else {
-              View decorView = activity.getWindow().getDecorView();
-              int systemUiVisibilityFlags = decorView.getSystemUiVisibility();
-              if ("dark-content".equals(style)) {
-                systemUiVisibilityFlags |= View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR;
-              } else {
-                systemUiVisibilityFlags &= ~View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR;
-              }
-              decorView.setSystemUiVisibility(systemUiVisibilityFlags);
-            }
-          }
-        });
-  }
-}