diff --git a/android/build.gradle b/android/build.gradle index c797f09..1ebf60c 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -36,7 +36,7 @@ def getExtOrIntegerDefault(name) { } android { - namespace "com.omni" + namespace "dev.zoriya.omni" ndkVersion getExtOrDefault("ndkVersion") compileSdkVersion getExtOrIntegerDefault("compileSdkVersion") @@ -143,6 +143,6 @@ if (isNewArchitectureEnabled()) { react { jsRootDir = file("../src/") libraryName = "Omni" - codegenJavaPackageName = "com.omni" + codegenJavaPackageName = "dev.zoriya.omni" } -} \ No newline at end of file +} diff --git a/android/src/main/java/com/omni/HybridOmni.kt b/android/src/main/java/dev/zoriya/omni/HybridOmni.kt similarity index 96% rename from android/src/main/java/com/omni/HybridOmni.kt rename to android/src/main/java/dev/zoriya/omni/HybridOmni.kt index 1ba6dc8..781b440 100755 --- a/android/src/main/java/com/omni/HybridOmni.kt +++ b/android/src/main/java/dev/zoriya/omni/HybridOmni.kt @@ -1,4 +1,4 @@ -package com.omni +package dev.zoriya.omni import android.graphics.Color import android.view.View diff --git a/android/src/main/java/com/omni/OmniPackage.kt b/android/src/main/java/dev/zoriya/omni/OmniPackage.kt similarity index 97% rename from android/src/main/java/com/omni/OmniPackage.kt rename to android/src/main/java/dev/zoriya/omni/OmniPackage.kt index ff1f7a5..fb08262 100755 --- a/android/src/main/java/com/omni/OmniPackage.kt +++ b/android/src/main/java/dev/zoriya/omni/OmniPackage.kt @@ -1,4 +1,4 @@ -package com.omni; +package dev.zoriya.omni; import com.facebook.react.bridge.NativeModule; import com.facebook.react.bridge.ReactApplicationContext; diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 2cfd044..1742d60 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -77,9 +77,9 @@ android { buildToolsVersion rootProject.ext.buildToolsVersion compileSdk rootProject.ext.compileSdkVersion - namespace "com.omniexample" + namespace "dev.zoriya.omniexample" defaultConfig { - applicationId "com.omniexample" + applicationId "dev.zoriya.omniexample" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 diff --git a/example/android/app/src/main/java/com/omniexample/MainActivity.kt b/example/android/app/src/main/java/com/omniexample/MainActivity.kt index f4756ca..c46d97e 100644 --- a/example/android/app/src/main/java/com/omniexample/MainActivity.kt +++ b/example/android/app/src/main/java/com/omniexample/MainActivity.kt @@ -1,4 +1,4 @@ -package com.omniexample +package dev.zoriya.omniexample import com.facebook.react.ReactActivity import com.facebook.react.ReactActivityDelegate diff --git a/example/android/app/src/main/java/com/omniexample/MainApplication.kt b/example/android/app/src/main/java/com/omniexample/MainApplication.kt index f92180b..eb5cc5e 100644 --- a/example/android/app/src/main/java/com/omniexample/MainApplication.kt +++ b/example/android/app/src/main/java/com/omniexample/MainApplication.kt @@ -1,4 +1,4 @@ -package com.omniexample +package dev.zoriya.omniexample import android.app.Application import com.facebook.react.PackageList diff --git a/example/ios/OmniExample.xcodeproj/project.pbxproj b/example/ios/OmniExample.xcodeproj/project.pbxproj index 1dd8e17..e6db344 100644 --- a/example/ios/OmniExample.xcodeproj/project.pbxproj +++ b/example/ios/OmniExample.xcodeproj/project.pbxproj @@ -271,7 +271,7 @@ "-ObjC", "-lc++", ); - PRODUCT_BUNDLE_IDENTIFIER = "com.omniexample"; + PRODUCT_BUNDLE_IDENTIFIER = "dev.zoriya.omniexample"; PRODUCT_NAME = OmniExample; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -300,7 +300,7 @@ "-ObjC", "-lc++", ); - PRODUCT_BUNDLE_IDENTIFIER = "com.omniexample"; + PRODUCT_BUNDLE_IDENTIFIER = "dev.zoriya.omniexample"; PRODUCT_NAME = OmniExample; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SWIFT_VERSION = 5.0; diff --git a/nitrogen/generated/android/OmniOnLoad.cpp b/nitrogen/generated/android/OmniOnLoad.cpp index c9aede7..fbef64e 100644 --- a/nitrogen/generated/android/OmniOnLoad.cpp +++ b/nitrogen/generated/android/OmniOnLoad.cpp @@ -28,7 +28,7 @@ int initialize(JavaVM* vm) { } struct JHybridOmniSpecImpl: public jni::JavaClass { - static constexpr auto kJavaDescriptor = "Lcom/omni/HybridOmni;"; + static constexpr auto kJavaDescriptor = "Ldev/zoriya/omni/HybridOmni;"; static std::shared_ptr create() { static const auto constructorFn = javaClassStatic()->getConstructor(); jni::local_ref javaPart = javaClassStatic()->newObject(constructorFn); diff --git a/nitrogen/generated/android/kotlin/com/margelo/nitro/omni/views/HybridOmniManager.kt b/nitrogen/generated/android/kotlin/com/margelo/nitro/omni/views/HybridOmniManager.kt index 081b37e..cc3515e 100644 --- a/nitrogen/generated/android/kotlin/com/margelo/nitro/omni/views/HybridOmniManager.kt +++ b/nitrogen/generated/android/kotlin/com/margelo/nitro/omni/views/HybridOmniManager.kt @@ -14,7 +14,7 @@ import com.facebook.react.uimanager.StateWrapper import com.facebook.react.uimanager.ThemedReactContext import com.margelo.nitro.R.id.associated_hybrid_view_tag import com.margelo.nitro.views.RecyclableView -import com.omni.* +import dev.zoriya.omni.* /** * Represents the React Native `ViewManager` for the "Omni" Nitro HybridView. diff --git a/nitrogen/generated/shared/json/OmniConfig.json b/nitrogen/generated/shared/json/OmniConfig.json index b11a48c..e0baf1d 100644 --- a/nitrogen/generated/shared/json/OmniConfig.json +++ b/nitrogen/generated/shared/json/OmniConfig.json @@ -1,10 +1,10 @@ { - "uiViewClassName": "Omni", - "supportsRawText": false, - "bubblingEventTypes": {}, - "directEventTypes": {}, - "validAttributes": { - "isRed": true, - "hybridRef": true - } + "uiViewClassName": "Omni", + "supportsRawText": false, + "bubblingEventTypes": {}, + "directEventTypes": {}, + "validAttributes": { + "isRed": true, + "hybridRef": true + } } diff --git a/post-script.js b/post-script.js index 4d8a9ac..87c1870 100644 --- a/post-script.js +++ b/post-script.js @@ -20,7 +20,7 @@ const updateViewManagerFiles = async (file) => { const viewManagerStr = await readFile(viewManagerFile, { encoding: "utf8" }); await writeFile( viewManagerFile, - viewManagerStr.replace(/com\.margelo\.nitro\.omni\.\*/g, "com.omni.*"), + viewManagerStr.replace(/com\.margelo\.nitro\.omni\.\*/g, "dev.zoriya.omni.*"), ); }; @@ -49,6 +49,6 @@ const androidWorkaround = async () => { } const str = await readFile(androidOnLoadFile, { encoding: "utf8" }); - await writeFile(androidOnLoadFile, str.replace(/margelo\/nitro\//g, "")); + await writeFile(androidOnLoadFile, str.replace(/com\/margelo\/nitro\//g, "dev/zoriya/")); }; androidWorkaround();