chore(🍏): Rename references from "ios" to "apple" (#3033)

* move `ios/RNSkia-iOS/*` to `apple/*`

* update podspec

* rename `RNSkiOSPlatformContext` to `RNSkApplePlatformContext`

* rename `RNSkiOSVideo` to `RNSkAppleVideo`

* rename `RnSkiOSView` to `RNSkAppleView`

---------

Co-authored-by: William Candillon <[email protected]>

Author: Saadnajmi

packages/skia/ios/RNSkia-iOS/MetalContext.h renamed to packages/skia/apple/MetalContext.h

@@ -14,10 +14,6 @@
 #import <include/gpu/ganesh/mtl/GrMtlDirectContext.h>
 #import <include/gpu/ganesh/mtl/SkSurfaceMetal.h>
 
-// namespace RNSkia {
-// class RNSkiOSPlatformContext;
-// }
-
 class MetalSharedContext {
 public:
   static MetalSharedContext &getInstance() {
@@ -126,7 +122,6 @@ class MetalContext {
   GrDirectContext *getDirectContext() { return _directContext.get(); }
 
 private:
-  // friend class RNSkia::RNSkiOSPlatformContext;
   id<MTLCommandQueue> _commandQueue = nullptr;
   sk_sp<GrDirectContext> _directContext = nullptr;
 

packages/skia/ios/RNSkia-iOS/MetalContext.mm renamed to packages/skia/apple/MetalContext.mm

@@ -18,9 +18,9 @@ class CallInvoker;
 
 namespace RNSkia {
 
-class RNSkiOSPlatformContext : public RNSkPlatformContext {
+class RNSkApplePlatformContext : public RNSkPlatformContext {
 public:
-  RNSkiOSPlatformContext(
+  RNSkApplePlatformContext(
       RCTBridge *bridge,
       std::shared_ptr<facebook::react::CallInvoker> jsCallInvoker)
       : RNSkPlatformContext(jsCallInvoker, [[UIScreen mainScreen] scale]) {
@@ -30,7 +30,7 @@ class RNSkiOSPlatformContext : public RNSkPlatformContext {
         [[ViewScreenshotService alloc] initWithUiManager:bridge.uiManager];
   }
 
-  ~RNSkiOSPlatformContext() = default;
+  ~RNSkApplePlatformContext() = default;
 
   void runOnMainThread(std::function<void()>) override;
 

packages/skia/ios/RNSkia-iOS/MetalWindowContext.h renamed to packages/skia/apple/MetalWindowContext.h

@@ -1,4 +1,4 @@
-#import "RNSkiOSPlatformContext.h"
+#import "RNSkApplePlatformContext.h"
 
 #import <CoreMedia/CMSampleBuffer.h>
 #include <Metal/Metal.h>
@@ -11,7 +11,7 @@
 #else
 #include "MetalContext.h"
 #endif
-#include "RNSkiOSVideo.h"
+#include "RNSkAppleVideo.h"
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
@@ -26,7 +26,7 @@
 
 namespace RNSkia {
 
-void RNSkiOSPlatformContext::performStreamOperation(
+void RNSkApplePlatformContext::performStreamOperation(
     const std::string &sourceUri,
     const std::function<void(std::unique_ptr<SkStreamAsset>)> &op) {
 
@@ -64,14 +64,14 @@
   std::thread(loader).detach();
 }
 
-void RNSkiOSPlatformContext::releaseNativeBuffer(uint64_t pointer) {
+void RNSkApplePlatformContext::releaseNativeBuffer(uint64_t pointer) {
   CVPixelBufferRef pixelBuffer = reinterpret_cast<CVPixelBufferRef>(pointer);
   if (pixelBuffer) {
     CFRelease(pixelBuffer);
   }
 }
 
-uint64_t RNSkiOSPlatformContext::makeNativeBuffer(sk_sp<SkImage> image) {
+uint64_t RNSkApplePlatformContext::makeNativeBuffer(sk_sp<SkImage> image) {
   // 0. If Image is not in BGRA, convert to BGRA as only BGRA is supported.
   if (image->colorType() != kBGRA_8888_SkColorType) {
 #if defined(SK_GRAPHITE)
@@ -156,7 +156,7 @@
   return reinterpret_cast<uint64_t>(pixelBuffer);
 }
 
-const TextureInfo RNSkiOSPlatformContext::getTexture(sk_sp<SkImage> image) {
+const TextureInfo RNSkApplePlatformContext::getTexture(sk_sp<SkImage> image) {
   GrBackendTexture texture;
   TextureInfo result;
   if (!SkImages::GetBackendTextureFromImage(image, &texture, true)) {
@@ -173,7 +173,7 @@
   return result;
 }
 
-const TextureInfo RNSkiOSPlatformContext::getTexture(sk_sp<SkSurface> surface) {
+const TextureInfo RNSkApplePlatformContext::getTexture(sk_sp<SkSurface> surface) {
   GrBackendTexture texture = SkSurfaces::GetBackendTexture(
       surface.get(), SkSurfaces::BackendHandleAccess::kFlushRead);
   TextureInfo result;
@@ -189,12 +189,12 @@
 }
 
 std::shared_ptr<RNSkVideo>
-RNSkiOSPlatformContext::createVideo(const std::string &url) {
-  return std::make_shared<RNSkiOSVideo>(url, this);
+RNSkApplePlatformContext::createVideo(const std::string &url) {
+  return std::make_shared<RNSkAppleVideo>(url, this);
 }
 
 std::shared_ptr<WindowContext>
-RNSkiOSPlatformContext::makeContextFromNativeSurface(void *surface, int width,
+RNSkApplePlatformContext::makeContextFromNativeSurface(void *surface, int width,
                                                      int height) {
 #if defined(SK_GRAPHITE)
   return DawnContext::getInstance().MakeWindow(surface, width, height);
@@ -204,11 +204,11 @@
 #endif
 }
 
-void RNSkiOSPlatformContext::raiseError(const std::exception &err) {
+void RNSkApplePlatformContext::raiseError(const std::exception &err) {
   RCTFatal(RCTErrorWithMessage([NSString stringWithUTF8String:err.what()]));
 }
 
-sk_sp<SkSurface> RNSkiOSPlatformContext::makeOffscreenSurface(int width,
+sk_sp<SkSurface> RNSkApplePlatformContext::makeOffscreenSurface(int width,
                                                               int height) {
 #if defined(SK_GRAPHITE)
   return DawnContext::getInstance().MakeOffscreen(width, height);
@@ -217,15 +217,15 @@
 #endif
 }
 
-sk_sp<SkImage> RNSkiOSPlatformContext::makeImageFromNativeBuffer(void *buffer) {
+sk_sp<SkImage> RNSkApplePlatformContext::makeImageFromNativeBuffer(void *buffer) {
 #if defined(SK_GRAPHITE)
   return DawnContext::getInstance().MakeImageFromBuffer(buffer);
 #else
   return MetalContext::getInstance().MakeImageFromBuffer(buffer);
 #endif
 }
 
-sk_sp<SkImage> RNSkiOSPlatformContext::makeImageFromNativeTexture(
+sk_sp<SkImage> RNSkApplePlatformContext::makeImageFromNativeTexture(
     const TextureInfo &texInfo, int width, int height, bool mipMapped) {
   id<MTLTexture> mtlTexture = (__bridge id<MTLTexture>)(texInfo.mtlTexture);
 
@@ -246,7 +246,7 @@
                                      kPremul_SkAlphaType, nullptr);
 }
 
-SkColorType RNSkiOSPlatformContext::mtlPixelFormatToSkColorType(
+SkColorType RNSkApplePlatformContext::mtlPixelFormatToSkColorType(
     MTLPixelFormat pixelFormat) {
   switch (pixelFormat) {
   case MTLPixelFormatRGBA8Unorm:
@@ -279,23 +279,23 @@
 }
 
 #if !defined(SK_GRAPHITE)
-GrDirectContext *RNSkiOSPlatformContext::getDirectContext() {
+GrDirectContext *RNSkApplePlatformContext::getDirectContext() {
   return MetalContext::getInstance().getDirectContext();
 }
 #endif
 
-sk_sp<SkFontMgr> RNSkiOSPlatformContext::createFontMgr() {
+sk_sp<SkFontMgr> RNSkApplePlatformContext::createFontMgr() {
   return SkFontMgr_New_CoreText(nullptr);
 }
 
-void RNSkiOSPlatformContext::runOnMainThread(std::function<void()> func) {
+void RNSkApplePlatformContext::runOnMainThread(std::function<void()> func) {
   dispatch_async(dispatch_get_main_queue(), ^{
     func();
   });
 }
 
 sk_sp<SkImage>
-RNSkiOSPlatformContext::takeScreenshotFromViewTag(size_t viewTag) {
+RNSkApplePlatformContext::takeScreenshotFromViewTag(size_t viewTag) {
   return [_screenshotService
       screenshotOfViewWithTag:[NSNumber numberWithLong:viewTag]];
 }

packages/skia/ios/RNSkia-iOS/MetalWindowContext.mm renamed to packages/skia/apple/MetalWindowContext.mm

@@ -18,7 +18,7 @@
 
 namespace RNSkia {
 
-class RNSkiOSVideo : public RNSkVideo {
+class RNSkAppleVideo : public RNSkVideo {
 private:
   std::string _url;
   AVPlayer *_player = nullptr;
@@ -35,8 +35,8 @@ class RNSkiOSVideo : public RNSkVideo {
   NSDictionary *getOutputSettings();
 
 public:
-  RNSkiOSVideo(std::string url, RNSkPlatformContext *context);
-  ~RNSkiOSVideo();
+  RNSkAppleVideo(std::string url, RNSkPlatformContext *context);
+  ~RNSkAppleVideo();
   sk_sp<SkImage> nextImage(double *timeStamp = nullptr) override;
   double duration() override;
   double framerate() override;

packages/skia/ios/RNSkia-iOS/RNSkiOSPlatformContext.h renamed to packages/skia/apple/RNSkApplePlatformContext.h

@@ -8,24 +8,24 @@
 
 #pragma clang diagnostic pop
 
-#include "RNSkiOSVideo.h"
+#include "RNSkAppleVideo.h"
 #include <AVFoundation/AVFoundation.h>
 #include <CoreVideo/CoreVideo.h>
 
 namespace RNSkia {
 
-RNSkiOSVideo::RNSkiOSVideo(std::string url, RNSkPlatformContext *context)
+RNSkAppleVideo::RNSkAppleVideo(std::string url, RNSkPlatformContext *context)
     : _url(std::move(url)), _context(context) {
   setupPlayer();
 }
 
-RNSkiOSVideo::~RNSkiOSVideo() {
+RNSkAppleVideo::~RNSkAppleVideo() {
   if (_player) {
     [_player pause];
   }
 }
 
-void RNSkiOSVideo::setupPlayer() {
+void RNSkAppleVideo::setupPlayer() {
   NSURL *videoURL = [NSURL URLWithString:@(_url.c_str())];
   AVPlayerItem *playerItem = [AVPlayerItem playerItemWithURL:videoURL];
   _player = [AVPlayer playerWithPlayerItem:playerItem];
@@ -53,7 +53,7 @@
   play();
 }
 
-sk_sp<SkImage> RNSkiOSVideo::nextImage(double *timeStamp) {
+sk_sp<SkImage> RNSkAppleVideo::nextImage(double *timeStamp) {
   CMTime currentTime = [_player currentTime];
   CVPixelBufferRef pixelBuffer =
       [_videoOutput copyPixelBufferForItemTime:currentTime
@@ -73,14 +73,14 @@
   return skImage;
 }
 
-NSDictionary *RNSkiOSVideo::getOutputSettings() {
+NSDictionary *RNSkAppleVideo::getOutputSettings() {
   return @{
     (id)kCVPixelBufferPixelFormatTypeKey : @(kCVPixelFormatType_32BGRA),
     (id)kCVPixelBufferMetalCompatibilityKey : @YES
   };
 }
 
-float RNSkiOSVideo::getRotationInDegrees() {
+float RNSkAppleVideo::getRotationInDegrees() {
   CGFloat rotationAngle = 0.0;
   auto transform = _preferredTransform;
   // Determine the rotation angle in radians
@@ -97,7 +97,7 @@
   return rotationAngle;
 }
 
-void RNSkiOSVideo::seek(double timeInMilliseconds) {
+void RNSkAppleVideo::seek(double timeInMilliseconds) {
   CMTime seekTime =
       CMTimeMakeWithSeconds(timeInMilliseconds / 1000.0, NSEC_PER_SEC);
   [_player seekToTime:seekTime
@@ -110,28 +110,28 @@
       }];
 }
 
-void RNSkiOSVideo::play() {
+void RNSkAppleVideo::play() {
   if (_player) {
     [_player play];
     _isPlaying = true;
   }
 }
 
-void RNSkiOSVideo::pause() {
+void RNSkAppleVideo::pause() {
   if (_player) {
     [_player pause];
     _isPlaying = false;
   }
 }
 
-double RNSkiOSVideo::duration() { return _duration; }
+double RNSkAppleVideo::duration() { return _duration; }
 
-double RNSkiOSVideo::framerate() { return _framerate; }
+double RNSkAppleVideo::framerate() { return _framerate; }
 
-SkISize RNSkiOSVideo::getSize() {
+SkISize RNSkAppleVideo::getSize() {
   return SkISize::Make(_videoWidth, _videoHeight);
 }
 
-void RNSkiOSVideo::setVolume(float volume) { _player.volume = volume; }
+void RNSkAppleVideo::setVolume(float volume) { _player.volume = volume; }
 
 } // namespace RNSkia

packages/skia/ios/RNSkia-iOS/RNSkiOSPlatformContext.mm renamed to packages/skia/apple/RNSkApplePlatformContext.mm

@@ -4,18 +4,18 @@
 
 #import "RNSkMetalCanvasProvider.h"
 #import "RNSkView.h"
-#import "RNSkiOSPlatformContext.h"
+#import "RNSkApplePlatformContext.h"
 
-class RNSkBaseiOSView {
+class RNSkBaseAppleView {
 public:
   virtual CALayer *getLayer() = 0;
   virtual void setSize(int width, int height) = 0;
   virtual std::shared_ptr<RNSkia::RNSkView> getDrawView() = 0;
 };
 
-template <class T> class RNSkiOSView : public RNSkBaseiOSView, public T {
+template <class T> class RNSkAppleView : public RNSkBaseAppleView, public T {
 public:
-  RNSkiOSView(std::shared_ptr<RNSkia::RNSkPlatformContext> context)
+  RNSkAppleView(std::shared_ptr<RNSkia::RNSkPlatformContext> context)
       : T(context,
           std::make_shared<RNSkMetalCanvasProvider>(
               std::bind(&RNSkia::RNSkView::requestRedraw, this), context)) {}

packages/skia/ios/RNSkia-iOS/RNSkiOSVideo.h renamed to packages/skia/apple/RNSkAppleVideo.h

@@ -2,18 +2,18 @@
 
 #import "RNSkMetalCanvasProvider.h"
 #import "RNSkView.h"
-#import "RNSkiOSPlatformContext.h"
+#import "RNSkApplePlatformContext.h"
 
-class RNSkBaseiOSView {
+class RNSkBaseAppleView {
 public:
   virtual CALayer *getLayer() = 0;
   virtual void setSize(int width, int height) = 0;
   virtual std::shared_ptr<RNSkia::RNSkView> getDrawView() = 0;
 };
 
-template <class T> class RNSkiOSView : public RNSkBaseiOSView, public T {
+template <class T> class RNSkAppleView : public RNSkBaseAppleView, public T {
 public:
-  RNSkiOSView(std::shared_ptr<RNSkia::RNSkPlatformContext> context)
+  RNSkAppleView(std::shared_ptr<RNSkia::RNSkPlatformContext> context)
       : T(context,
           std::make_shared<RNSkMetalCanvasProvider>(
               std::bind(&RNSkia::RNSkView::requestRedraw, this), context)) {}