fix(flagship): Make android namespace match package name

packages/flagship/android/app/BUCK

@@ -35,13 +35,13 @@ android_library(
 
 android_build_config(
  name = 'build_config',
- package = 'com.brandingbrand.reactnative.and.flagship',
+ package = 'CONFIG_BUNDLE_ID',
 )
 
 android_resource(
  name = 'res',
  res = 'src/main/res',
- package = 'com.brandingbrand.reactnative.and.flagship',
+ package = 'CONFIG_BUNDLE_ID',
 )
 
 android_binary(

packages/flagship/android/app/build.gradle

@@ -107,7 +107,7 @@ android {
 
  defaultConfig {
  multiDexEnabled true
- applicationId "com.brandingbrand.reactnative.and.flagship"
+ applicationId "CONFIG_BUNDLE_ID"
  minSdkVersion rootProject.ext.minSdkVersion
  targetSdkVersion rootProject.ext.targetSdkVersion
  versionName project.VERSION_NAME

packages/flagship/android/app/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.brandingbrand.reactnative.and.flagship">
+ package="CONFIG_BUNDLE_ID">
 
  <uses-permission android:name="android.permission.INTERNET" />
  <uses-permission android:name="android.permission.RECORD_AUDIO" />

packages/flagship/android/app/src/main/java/com/brandingbrand/reactnative/and/flagship/EnvSwitcher.java

@@ -1,4 +1,4 @@
-package com.brandingbrand.reactnative.and.flagship;
+package CONFIG_BUNDLE_ID;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -44,4 +44,4 @@ public void setEnv(String name, Promise promise) {
 
  promise.resolve(null);
  }
-}
+}

packages/flagship/android/app/src/main/java/com/brandingbrand/reactnative/and/flagship/EnvSwitcherPackage.java

@@ -1,4 +1,4 @@
-package com.brandingbrand.reactnative.and.flagship;
+package CONFIG_BUNDLE_ID;
 
 import com.facebook.react.ReactPackage;
 import com.facebook.react.bridge.NativeModule;
@@ -21,4 +21,4 @@ public List<NativeModule> createNativeModules(final ReactApplicationContext reac
  add(new EnvSwitcher(reactContext));
  }};
  }
-}
+}

packages/flagship/android/app/src/main/java/com/brandingbrand/reactnative/and/flagship/MainActivity.java

@@ -1,4 +1,4 @@
-package com.brandingbrand.reactnative.and.flagship;
+package CONFIG_BUNDLE_ID;
 
 import com.reactnativenavigation.controllers.SplashActivity;
 
@@ -7,4 +7,4 @@ public class MainActivity extends SplashActivity {
  public int getSplashLayout() {
  return R.layout.splash;
  }
-}
+}

packages/flagship/android/app/src/main/java/com/brandingbrand/reactnative/and/flagship/MainApplication.java

@@ -1,4 +1,4 @@
-package com.brandingbrand.reactnative.and.flagship;
+package CONFIG_BUNDLE_ID;
 
 import android.app.Application;
 

packages/flagship/android/app/src/main/java/com/brandingbrand/reactnative/and/flagship/NativeConstants.java

@@ -1,4 +1,4 @@
-package com.brandingbrand.reactnative.and.flagship;
+package CONFIG_BUNDLE_ID;
 
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
@@ -24,4 +24,4 @@ public Map<String, Object> getConstants() {
 
  return constants;
  }
-}
+}

packages/flagship/android/app/src/main/java/com/brandingbrand/reactnative/and/flagship/NativeConstantsPackage.java

@@ -1,4 +1,4 @@
-package com.brandingbrand.reactnative.and.flagship;
+package CONFIG_BUNDLE_ID;
 
 import com.facebook.react.ReactPackage;
 import com.facebook.react.bridge.NativeModule;
@@ -21,4 +21,4 @@ public List<NativeModule> createNativeModules(final ReactApplicationContext reac
  add(new NativeConstants(reactContext));
  }};
  }
-}
+}

packages/flagship/android/app/src/main/java/com/brandingbrand/reactnative/and/flagship/ThreadSafeUIImplementation.java

@@ -1,4 +1,4 @@
-package com.brandingbrand.reactnative.and.flagship;
+package CONFIG_BUNDLE_ID;
 
 import android.support.annotation.Nullable;
 

packages/flagship/src/commands/init.ts

@@ -31,6 +31,8 @@ export interface HandlerArgs {
  env: string;
 }
 
+const TEMPLATE_ANDROID_PACKAGE = 'com.brandingbrand.reactnative.and.flagship';
+
 export const command = 'init [platform]';
 
 export const describe = 'initialize FLAGSHIP for [platform]';
@@ -128,8 +130,16 @@ function initAndroid(
  fs.clone('android');
 
  const androidConfig = android.androidConfigWithDefault(configuration.android);
+
+ // The id should be defined, but set it to a default if it's not for compatibility reasons
+ const pkgId = configuration.bundleIds && configuration.bundleIds.android ?
+ configuration.bundleIds.android.toLowerCase() :
+ `com.brandingbrand.reactnative.and.${configuration.name.toLowerCase()}`;
+
  // Rename the boilerplate project with the app name
  rename.source('FLAGSHIP', configuration.name, 'android');
+ rename.source('CONFIG_BUNDLE_ID', pkgId, 'android');
+ rename.pkgDirectory(TEMPLATE_ANDROID_PACKAGE, pkgId, path.android.mainPath(), 'java');
  rename.files('FLAGSHIP', configuration.name, 'android');
 
  fastlane.configure(path.android.fastfilePath(), configuration); // Update Fastfile

packages/flagship/src/index.ts

@@ -0,0 +1,33 @@
+import * as android from './lib/android';
+import * as cocoapods from './lib/cocoapods';
+import * as deeplinking from './lib/deeplinking';
+import * as env from './lib/env';
+import * as fastlane from './lib/fastlane';
+import * as fs from './lib/fs';
+import * as ios from './lib/ios';
+import * as link from './lib/link';
+import * as modules from './lib/modules';
+import * as nativeConstants from './lib/native-constants';
+import * as os from './lib/os';
+import * as path from './lib/path';
+import * as rename from './lib/rename';
+import * as version from './lib/version';
+import * as web from './lib/web';
+
+export {
+ android,
+ cocoapods,
+ deeplinking,
+ env,
+ fastlane,
+ fs,
+ ios,
+ link,
+ modules,
+ nativeConstants,
+ os,
+ path,
+ rename,
+ version,
+ web
+};

packages/flagship/src/lib/fs.ts

@@ -2,6 +2,7 @@ import {
  copySync,
  ensureDirSync,
  ensureSymlinkSync,
+ moveSync,
  pathExistsSync,
  readdirSync,
  readFileSync,
@@ -18,7 +19,8 @@ export {
  ensureDirSync,
  renameSync,
  pathExistsSync,
- ensureSymlinkSync
+ ensureSymlinkSync,
+ moveSync
 };
 
 import * as helpers from '../helpers';

packages/flagship/src/lib/path.ts

@@ -169,14 +169,14 @@ function getManifestPath(): string {
  * @returns {string} The path to the native project.
  */
 function getNativeProjectPathAndriod(configuration: Config): string {
+ const pkgId = configuration.bundleIds && configuration.bundleIds.android ?
+ configuration.bundleIds.android :
+ `com.brandingbrand.reactnative.and.${configuration.name}`;
+
  return resolvePathFromProject(
  getMainPath(),
  'java',
- 'com',
- 'brandingbrand',
- 'reactnative',
- 'and',
- configuration.name.toLowerCase()
+ ...pkgId.toLowerCase().split('.')
  );
 }
 

packages/flagship/src/lib/rename.ts

@@ -34,6 +34,54 @@ export function source(oldName: string, newName: string, ...pathComponents: stri
  logInfo(`renamed project within source in ${directory}`);
 }
 
+/**
+ * Updates the directory structure to match a new namespace
+ *
+ * @param {string} oldPkg The old package name to replace.
+ * @param {string} newPkg The new package name to use.
+ * @param {...string} pathComponents Path components to the directory in which to
+ * replace the project name.
+ */
+export function pkgDirectory(oldPkg: string, newPkg: string, ...pathComponents: string[]): void {
+ const directory = path.project.resolve(...pathComponents);
+ const oldPathPart = oldPkg.replace(/\./g, '/');
+ const newPathPart = newPkg.replace(/\./g, '/');
+
+ try {
+ const results = getMatchingFiles(directory, oldPathPart);
+
+ // Rename matching paths
+ results.forEach(oldPath => {
+ const newPath = oldPath.replace(oldPathPart, newPathPart).toLowerCase();
+ fs.moveSync(oldPath, newPath);
+ });
+
+ // since we only moved the bottom-most directory, traverse through the old
+ // package directories to delete any empty package folders
+ oldPkg
+ .split('.')
+ .reduce<string[]>((parts, part, index, arr) => {
+ const pattern = [...arr.slice(0, index), part].join('/');
+ parts.push(...getMatchingFiles(directory, pattern));
+ return parts;
+ }, [])
+ .reverse()
+ .forEach(dir => {
+ const contents = fs.pathExistsSync(dir) && fs.readdirSync(dir);
+ if (Array.isArray(contents) && contents.length === 0) {
+ fs.removeSync(dir);
+ }
+ });
+
+ } catch (err) {
+ logError('renaming project files', err);
+ process.exit(1);
+ }
+
+ logInfo(`renamed project files in ${directory}`);
+}
+
+
 /**
  * Replaces the project name within boilerplate file names.
  *
@@ -46,21 +94,7 @@ export function files(oldName: string, newName: string, ...pathComponents: strin
  const directory = path.project.resolve(...pathComponents);
 
  try {
- const globOptions = {
- nosort: true,
- dot: true
- };
-
- // Find files/directories to be renamed
- const results = [
- ...sync(directory + '/**/*' + oldName + '*', globOptions),
- ...sync(directory + '/**/*' + oldName.toLocaleLowerCase() + '*', globOptions)
- ];
-
- // Sort the results so highest depth paths are replaced first
- results.sort((a, b) => {
- return b.length - a.length;
- });
+ const results = getMatchingFiles(directory, oldName);
 
  // Rename each path
  results.forEach(oldPath => {
@@ -79,5 +113,28 @@ export function files(oldName: string, newName: string, ...pathComponents: strin
  process.exit(1);
  }
 
- logInfo(`renaming project files in ${directory}`);
+ logInfo(`renamed project files in ${directory}`);
+}
+
+function getMatchingFiles(directory: string, oldName: string): string[] {
+ const globOptions = {
+ nosort: true,
+ dot: true
+ };
+
+ // Find files/directories to be renamed
+ const results = [
+ ...sync(directory + '/**/*' + oldName + '*', globOptions),
+ ...sync(directory + '/**/*' + oldName.toLocaleLowerCase() + '*', globOptions)
+ ];
+
+ // Remove duplicate paths from the results array
+ const uniqueResults = Array.from(new Set(results));
+
+ // Sort the results so highest depth paths are replaced first
+ uniqueResults.sort((a, b) => {
+ return b.length - a.length;
+ });
+
+ return uniqueResults;
 }