diff --git a/android/app/_BUCK b/android/app/_BUCK index c3ced5141c..8f24da4860 100644 --- a/android/app/_BUCK +++ b/android/app/_BUCK @@ -35,12 +35,12 @@ android_library( android_build_config( name = "build_config", - package = "xyz.blueskyweb.pubsq", + package = "app.bsky", ) android_resource( name = "res", - package = "xyz.blueskyweb.pubsq", + package = "app.bsky", res = "src/main/res", ) diff --git a/android/app/build.gradle b/android/app/build.gradle index 0920a076d2..d439c075f3 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -135,7 +135,7 @@ android { compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { - applicationId "xyz.blueskyweb.pubsq" + applicationId "app.bsky" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 39217ac114..d5364316d5 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="app.bsky"> @@ -26,17 +26,17 @@ - + - + - - + + diff --git a/android/app/src/main/java/xyz/blueskyweb/pubsq/AppSecureRandomModule.java b/android/app/src/main/java/xyz/blueskyweb/pubsq/AppSecureRandomModule.java index 96887c36ff..3724d9603d 100644 --- a/android/app/src/main/java/xyz/blueskyweb/pubsq/AppSecureRandomModule.java +++ b/android/app/src/main/java/xyz/blueskyweb/pubsq/AppSecureRandomModule.java @@ -1,4 +1,4 @@ -package xyz.blueskyweb.pubsq; +package app.bsky; import com.facebook.react.bridge.ReactApplicationContext; import com.facebook.react.bridge.ReactContextBaseJavaModule; diff --git a/android/app/src/main/java/xyz/blueskyweb/pubsq/AppSecureRandomPackage.java b/android/app/src/main/java/xyz/blueskyweb/pubsq/AppSecureRandomPackage.java index 1fd6507478..f0892b0e8c 100644 --- a/android/app/src/main/java/xyz/blueskyweb/pubsq/AppSecureRandomPackage.java +++ b/android/app/src/main/java/xyz/blueskyweb/pubsq/AppSecureRandomPackage.java @@ -1,4 +1,4 @@ -package xyz.blueskyweb.pubsq; +package app.bsky; import com.facebook.react.ReactPackage; import com.facebook.react.bridge.NativeModule; diff --git a/android/app/src/main/java/xyz/blueskyweb/pubsq/MainActivity.java b/android/app/src/main/java/xyz/blueskyweb/pubsq/MainActivity.java index 486ce5c711..d63f426059 100644 --- a/android/app/src/main/java/xyz/blueskyweb/pubsq/MainActivity.java +++ b/android/app/src/main/java/xyz/blueskyweb/pubsq/MainActivity.java @@ -1,4 +1,4 @@ -package xyz.blueskyweb.pubsq; +package app.bsky; import com.facebook.react.ReactActivity; import com.facebook.react.ReactActivityDelegate; @@ -13,7 +13,7 @@ public class MainActivity extends ReactActivity { */ @Override protected String getMainComponentName() { - return "xyz.blueskyweb.pubsq"; + return "app.bsky"; } /** diff --git a/android/app/src/main/java/xyz/blueskyweb/pubsq/MainApplication.java b/android/app/src/main/java/xyz/blueskyweb/pubsq/MainApplication.java index 8c554a4802..2d38947e25 100644 --- a/android/app/src/main/java/xyz/blueskyweb/pubsq/MainApplication.java +++ b/android/app/src/main/java/xyz/blueskyweb/pubsq/MainApplication.java @@ -1,4 +1,4 @@ -package xyz.blueskyweb.pubsq; +package app.bsky; import android.app.Application; import android.content.Context; @@ -9,7 +9,7 @@ import com.facebook.react.ReactNativeHost; import com.facebook.react.ReactPackage; import com.facebook.react.config.ReactFeatureFlags; import com.facebook.soloader.SoLoader; -import xyz.blueskyweb.pubsq.newarchitecture.MainApplicationReactNativeHost; +import app.bsky.newarchitecture.MainApplicationReactNativeHost; import java.lang.reflect.InvocationTargetException; import java.util.List; diff --git a/android/app/src/main/java/xyz/blueskyweb/pubsq/newarchitecture/MainApplicationReactNativeHost.java b/android/app/src/main/java/xyz/blueskyweb/pubsq/newarchitecture/MainApplicationReactNativeHost.java index 18fb620af4..bb1f2adcea 100644 --- a/android/app/src/main/java/xyz/blueskyweb/pubsq/newarchitecture/MainApplicationReactNativeHost.java +++ b/android/app/src/main/java/xyz/blueskyweb/pubsq/newarchitecture/MainApplicationReactNativeHost.java @@ -1,4 +1,4 @@ -package xyz.blueskyweb.pubsq.newarchitecture; +package app.bsky.newarchitecture; import android.app.Application; import androidx.annotation.NonNull; @@ -19,9 +19,9 @@ import com.facebook.react.fabric.CoreComponentsRegistry; import com.facebook.react.fabric.EmptyReactNativeConfig; import com.facebook.react.fabric.FabricJSIModuleProvider; import com.facebook.react.uimanager.ViewManagerRegistry; -import xyz.blueskyweb.pubsq.BuildConfig; -import xyz.blueskyweb.pubsq.newarchitecture.components.MainComponentsRegistry; -import xyz.blueskyweb.pubsq.newarchitecture.modules.MainApplicationTurboModuleManagerDelegate; +import app.bsky.BuildConfig; +import app.bsky.newarchitecture.components.MainComponentsRegistry; +import app.bsky.newarchitecture.modules.MainApplicationTurboModuleManagerDelegate; import java.util.ArrayList; import java.util.List; diff --git a/android/app/src/main/java/xyz/blueskyweb/pubsq/newarchitecture/components/MainComponentsRegistry.java b/android/app/src/main/java/xyz/blueskyweb/pubsq/newarchitecture/components/MainComponentsRegistry.java index a219dd5e3e..a0a2482ce0 100644 --- a/android/app/src/main/java/xyz/blueskyweb/pubsq/newarchitecture/components/MainComponentsRegistry.java +++ b/android/app/src/main/java/xyz/blueskyweb/pubsq/newarchitecture/components/MainComponentsRegistry.java @@ -1,4 +1,4 @@ -package xyz.blueskyweb.pubsq.newarchitecture.components; +package app.bsky.newarchitecture.components; import com.facebook.jni.HybridData; import com.facebook.proguard.annotations.DoNotStrip; diff --git a/android/app/src/main/java/xyz/blueskyweb/pubsq/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate.java b/android/app/src/main/java/xyz/blueskyweb/pubsq/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate.java index 2387471cc2..bbb99f7b8f 100644 --- a/android/app/src/main/java/xyz/blueskyweb/pubsq/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate.java +++ b/android/app/src/main/java/xyz/blueskyweb/pubsq/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate.java @@ -1,4 +1,4 @@ -package xyz.blueskyweb.pubsq.newarchitecture.modules; +package app.bsky.newarchitecture.modules; import com.facebook.jni.HybridData; import com.facebook.react.ReactPackage; diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index d85b3b5f7c..84bacdca59 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -1,3 +1,3 @@ - pubsq + bsky diff --git a/ios/app.xcodeproj/project.pbxproj b/ios/app.xcodeproj/project.pbxproj index 5adf1695b2..ccbfc679eb 100644 --- a/ios/app.xcodeproj/project.pbxproj +++ b/ios/app.xcodeproj/project.pbxproj @@ -474,7 +474,7 @@ "-ObjC", "-lc++", ); - PRODUCT_BUNDLE_IDENTIFIER = xyz.blueskyweb.pubsq; + PRODUCT_BUNDLE_IDENTIFIER = app.bsky; PRODUCT_NAME = app; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; @@ -502,7 +502,7 @@ "-ObjC", "-lc++", ); - PRODUCT_BUNDLE_IDENTIFIER = xyz.blueskyweb.pubsq; + PRODUCT_BUNDLE_IDENTIFIER = app.bsky; PRODUCT_NAME = app; SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; diff --git a/ios/app/AppDelegate.mm b/ios/app/AppDelegate.mm index 474f994e8d..96e1cca1a8 100644 --- a/ios/app/AppDelegate.mm +++ b/ios/app/AppDelegate.mm @@ -44,7 +44,7 @@ bridge.surfacePresenter = _bridgeAdapter.surfacePresenter; #endif - UIView *rootView = RCTAppSetupDefaultRootView(bridge, @"xyz.blueskyweb.pubsq", nil); + UIView *rootView = RCTAppSetupDefaultRootView(bridge, @"app.bsky", nil); if (@available(iOS 13.0, *)) { rootView.backgroundColor = [UIColor systemBackgroundColor]; diff --git a/ios/app/Info.plist b/ios/app/Info.plist index a527f1fcc0..2d1a86eec5 100644 --- a/ios/app/Info.plist +++ b/ios/app/Info.plist @@ -5,7 +5,7 @@ CFBundleDevelopmentRegion en CFBundleDisplayName - PubSQ + Bluesky CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier @@ -26,10 +26,10 @@ CFBundleTypeRole Editor CFBundleURLName - xyz.blueskyweb.pubsq + app.bsky CFBundleURLSchemes - pubsqapp + bskyapp diff --git a/ios/app/app.entitlements b/ios/app/app.entitlements index ad10c10e5a..8ea56bd537 100644 --- a/ios/app/app.entitlements +++ b/ios/app/app.entitlements @@ -4,7 +4,7 @@ com.apple.developer.associated-domains - applinks:pubsq.pfrazee.com + applinks:bsky.pfrazee.com diff --git a/src/app.json b/src/app.json index 76a5223a6a..0f8282d5f7 100644 --- a/src/app.json +++ b/src/app.json @@ -1,4 +1,4 @@ { - "name": "xyz.blueskyweb.pubsq", - "displayName": "pubsq" + "name": "app.bsky", + "displayName": "Bluesky" } \ No newline at end of file diff --git a/src/platform/urls.tsx b/src/platform/urls.tsx index 048c92f2eb..0f24dd678c 100644 --- a/src/platform/urls.tsx +++ b/src/platform/urls.tsx @@ -3,9 +3,9 @@ import {isIOS, isAndroid, isNative, isWeb} from './detection' export function makeAppUrl(path = '') { if (isIOS) { - return `pubsqapp://${path}` + return `bskyapp://${path}` } else if (isAndroid) { - return `pubsq://app${path}` + return `bsky://app${path}` } else { // @ts-ignore window exists -prf return `${window.location.origin}${path}`