diff --git a/Gemfile b/Gemfile index 5efda89..567e598 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version -ruby '2.7.5' +ruby File.read(File.join(__dir__, '.ruby-version')).strip -gem 'cocoapods', '~> 1.11', '>= 1.11.2' +gem 'cocoapods', '~> 1.11', '>= 1.11.3' diff --git a/android/app/_BUCK b/android/app/_BUCK deleted file mode 100644 index 2d3be5c..0000000 --- a/android/app/_BUCK +++ /dev/null @@ -1,55 +0,0 @@ -# To learn about Buck see [Docs](https://buckbuild.com/). -# To run your application with Buck: -# - install Buck -# - `npm start` - to start the packager -# - `cd android` -# - `keytool -genkey -v -keystore keystores/debug.keystore -storepass android -alias androiddebugkey -keypass android -dname "CN=Android Debug,O=Android,C=US"` -# - `./gradlew :app:copyDownloadableDepsToLibs` - make all Gradle compile dependencies available to Buck -# - `buck install -r android/app` - compile, install and run application -# - -load(":build_defs.bzl", "create_aar_targets", "create_jar_targets") - -lib_deps = [] - -create_aar_targets(glob(["libs/*.aar"])) - -create_jar_targets(glob(["libs/*.jar"])) - -android_library( - name = "all-libs", - exported_deps = lib_deps, -) - -android_library( - name = "app-code", - srcs = glob([ - "src/main/java/**/*.java", - ]), - deps = [ - ":all-libs", - ":build_config", - ":res", - ], -) - -android_build_config( - name = "build_config", - package = "com.owlrangenotes", -) - -android_resource( - name = "res", - package = "com.owlrangenotes", - res = "src/main/res", -) - -android_binary( - name = "app", - keystore = "//android/keystores:debug", - manifest = "src/main/AndroidManifest.xml", - package_type = "debug", - deps = [ - ":app-code", - ], -) diff --git a/android/app/build.gradle b/android/app/build.gradle index 0816699..9251125 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -1,128 +1,87 @@ apply plugin: "com.android.application" +apply plugin: "com.facebook.react" import com.android.build.OutputFile -import org.apache.tools.ant.taskdefs.condition.Os /** - * The react.gradle file registers a task for each build variant (e.g. bundleDebugJsAndAssets - * and bundleReleaseJsAndAssets). - * These basically call `react-native bundle` with the correct arguments during the Android build - * cycle. By default, bundleDebugJsAndAssets is skipped, as in debug/dev mode we prefer to load the - * bundle directly from the development server. Below you can see all the possible configurations - * and their defaults. If you decide to add a configuration block, make sure to add it before the - * `apply from: "../../node_modules/react-native/react.gradle"` line. - * - * project.ext.react = [ - * // the name of the generated asset file containing your JS bundle - * bundleAssetName: "index.android.bundle", - * - * // the entry file for bundle generation. If none specified and - * // "index.android.js" exists, it will be used. Otherwise "index.js" is - * // default. Can be overridden with ENTRY_FILE environment variable. - * entryFile: "index.android.js", - * - * // https://reactnative.dev/docs/performance#enable-the-ram-format - * bundleCommand: "ram-bundle", - * - * // whether to bundle JS and assets in debug mode - * bundleInDebug: false, - * - * // whether to bundle JS and assets in release mode - * bundleInRelease: true, - * - * // whether to bundle JS and assets in another build variant (if configured). - * // See http://tools.android.com/tech-docs/new-build-system/user-guide#TOC-Build-Variants - * // The configuration property can be in the following formats - * // 'bundleIn${productFlavor}${buildType}' - * // 'bundleIn${buildType}' - * // bundleInFreeDebug: true, - * // bundleInPaidRelease: true, - * // bundleInBeta: true, - * - * // whether to disable dev mode in custom build variants (by default only disabled in release) - * // for example: to disable dev mode in the staging build type (if configured) - * devDisabledInStaging: true, - * // The configuration property can be in the following formats - * // 'devDisabledIn${productFlavor}${buildType}' - * // 'devDisabledIn${buildType}' - * - * // the root of your project, i.e. where "package.json" lives - * root: "../../", - * - * // where to put the JS bundle asset in debug mode - * jsBundleDirDebug: "$buildDir/intermediates/assets/debug", - * - * // where to put the JS bundle asset in release mode - * jsBundleDirRelease: "$buildDir/intermediates/assets/release", - * - * // where to put drawable resources / React Native assets, e.g. the ones you use via - * // require('./image.png')), in debug mode - * resourcesDirDebug: "$buildDir/intermediates/res/merged/debug", - * - * // where to put drawable resources / React Native assets, e.g. the ones you use via - * // require('./image.png')), in release mode - * resourcesDirRelease: "$buildDir/intermediates/res/merged/release", - * - * // by default the gradle tasks are skipped if none of the JS files or assets change; this means - * // that we don't look at files in android/ or ios/ to determine whether the tasks are up to - * // date; if you have any other folders that you want to ignore for performance reasons (gradle - * // indexes the entire tree), add them here. Alternatively, if you have JS files in android/ - * // for example, you might want to remove it from here. - * inputExcludes: ["android/**", "ios/**"], - * - * // override which node gets called and with what additional arguments - * nodeExecutableAndArgs: ["node"], - * - * // supply additional arguments to the packager - * extraPackagerArgs: [] - * ] + * This is the configuration block to customize your React Native Android app. + * By default you don't need to apply any configuration, just uncomment the lines you need. */ - -project.ext.react = [ - enableHermes: true, // clean and rebuild if changing -] - -apply from: "../../node_modules/react-native/react.gradle" +react { + /* Folders */ + // The root of your project, i.e. where "package.json" lives. Default is '..' + // root = file("../") + // The folder where the react-native NPM package is. Default is ../node_modules/react-native + // reactNativeDir = file("../node_modules/react-native") + // The folder where the react-native Codegen package is. Default is ../node_modules/react-native-codegen + // codegenDir = file("../node_modules/react-native-codegen") + // The cli.js file which is the React Native CLI entrypoint. Default is ../node_modules/react-native/cli.js + // cliFile = file("../node_modules/react-native/cli.js") + + /* Variants */ + // The list of variants to that are debuggable. For those we're going to + // skip the bundling of the JS bundle and the assets. By default is just 'debug'. + // If you add flavors like lite, prod, etc. you'll have to list your debuggableVariants. + // debuggableVariants = ["liteDebug", "prodDebug"] + + /* Bundling */ + // A list containing the node command and its flags. Default is just 'node'. + // nodeExecutableAndArgs = ["node"] + // + // The command to run when bundling. By default is 'bundle' + // bundleCommand = "ram-bundle" + // + // The path to the CLI configuration file. Default is empty. + // bundleConfig = file(../rn-cli.config.js) + // + // The name of the generated asset file containing your JS bundle + // bundleAssetName = "MyApplication.android.bundle" + // + // The entry file for bundle generation. Default is 'index.android.js' or 'index.js' + // entryFile = file("../js/MyApplication.android.js") + // + // A list of extra flags to pass to the 'bundle' commands. + // See https://github.com/react-native-community/cli/blob/main/docs/commands.md#bundle + // extraPackagerArgs = [] + + /* Hermes Commands */ + // The hermes compiler command to run. By default it is 'hermesc' + // hermesCommand = "$rootDir/my-custom-hermesc/bin/hermesc" + // + // The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map" + // hermesFlags = ["-O", "-output-source-map"] +} /** - * Set this to true to create two separate APKs instead of one: - * - An APK that only works on ARM devices - * - An APK that only works on x86 devices - * The advantage is the size of the APK is reduced by about 4MB. - * Upload all the APKs to the Play Store and people will download - * the correct one based on the CPU architecture of their device. + * Set this to true to create four separate APKs instead of one, + * one for each native architecture. This is useful if you don't + * use App Bundles (https://developer.android.com/guide/app-bundle/) + * and want to have separate APKs to upload to the Play Store. */ def enableSeparateBuildPerCPUArchitecture = false /** - * Run Proguard to shrink the Java bytecode in release builds. + * Set this to true to Run Proguard on Release builds to minify the Java bytecode. */ def enableProguardInReleaseBuilds = false /** - * The preferred build flavor of JavaScriptCore. + * The preferred build flavor of JavaScriptCore (JSC) * * For example, to use the international variant, you can use: * `def jscFlavor = 'org.webkit:android-jsc-intl:+'` * * The international variant includes ICU i18n library and necessary data * allowing to use e.g. `Date.toLocaleString` and `String.localeCompare` that - * give correct results when using with locales other than en-US. Note that + * give correct results when using with locales other than en-US. Note that * this variant is about 6MiB larger per architecture than default. */ def jscFlavor = 'org.webkit:android-jsc:+' /** - * Whether to enable the Hermes VM. - * - * This should be set on project.ext.react and that value will be read here. If it is not set - * on project.ext.react, JavaScript will not be compiled to Hermes Bytecode - * and the benefits of using Hermes will therefore be sharply reduced. - */ -def enableHermes = project.ext.react.get("enableHermes", false); - -/** - * Architectures to build native code for. + * Private function to get the list of Native Architectures you want to build. + * This reads the value from reactNativeArchitectures in your gradle.properties + * file and works together with the --active-arch-only flag of react-native run-android. */ def reactNativeArchitectures() { def value = project.getProperties().get("reactNativeArchitectures") @@ -134,73 +93,13 @@ android { compileSdkVersion rootProject.ext.compileSdkVersion + namespace "com.studynon" defaultConfig { - applicationId "com.owlrangenotes" + applicationId "com.studynon" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" - buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString() - multiDexEnabled true - - if (isNewArchitectureEnabled()) { - // We configure the CMake build only if you decide to opt-in for the New Architecture. - externalNativeBuild { - cmake { - arguments "-DPROJECT_BUILD_DIR=$buildDir", - "-DREACT_ANDROID_DIR=$rootDir/../node_modules/react-native/ReactAndroid", - "-DREACT_ANDROID_BUILD_DIR=$rootDir/../node_modules/react-native/ReactAndroid/build", - "-DNODE_MODULES_DIR=$rootDir/../node_modules", - "-DANDROID_STL=c++_shared" - } - } - if (!enableSeparateBuildPerCPUArchitecture) { - ndk { - abiFilters (*reactNativeArchitectures()) - } - } - } - } - - if (isNewArchitectureEnabled()) { - // We configure the NDK build only if you decide to opt-in for the New Architecture. - externalNativeBuild { - cmake { - path "$projectDir/src/main/jni/CMakeLists.txt" - } - } - def reactAndroidProjectDir = project(':ReactAndroid').projectDir - def packageReactNdkDebugLibs = tasks.register("packageReactNdkDebugLibs", Copy) { - dependsOn(":ReactAndroid:packageReactNdkDebugLibsForBuck") - from("$reactAndroidProjectDir/src/main/jni/prebuilt/lib") - into("$buildDir/react-ndk/exported") - } - def packageReactNdkReleaseLibs = tasks.register("packageReactNdkReleaseLibs", Copy) { - dependsOn(":ReactAndroid:packageReactNdkReleaseLibsForBuck") - from("$reactAndroidProjectDir/src/main/jni/prebuilt/lib") - into("$buildDir/react-ndk/exported") - } - afterEvaluate { - // If you wish to add a custom TurboModule or component locally, - // you should uncomment this line. - // preBuild.dependsOn("generateCodegenArtifactsFromSchema") - preDebugBuild.dependsOn(packageReactNdkDebugLibs) - preReleaseBuild.dependsOn(packageReactNdkReleaseLibs) - - // Due to a bug inside AGP, we have to explicitly set a dependency - // between configureCMakeDebug* tasks and the preBuild tasks. - // This can be removed once this is solved: https://issuetracker.google.com/issues/207403732 - configureCMakeRelWithDebInfo.dependsOn(preReleaseBuild) - configureCMakeDebug.dependsOn(preDebugBuild) - reactNativeArchitectures().each { architecture -> - tasks.findByName("configureCMakeDebug[${architecture}]")?.configure { - dependsOn("preDebugBuild") - } - tasks.findByName("configureCMakeRelWithDebInfo[${architecture}]")?.configure { - dependsOn("preReleaseBuild") - } - } - } } splits { @@ -218,14 +117,6 @@ android { keyAlias 'androiddebugkey' keyPassword 'android' } - release { - if (project.hasProperty('MYAPP_UPLOAD_STORE_FILE')) { - storeFile file(MYAPP_UPLOAD_STORE_FILE) - storePassword MYAPP_UPLOAD_STORE_PASSWORD - keyAlias MYAPP_UPLOAD_KEY_ALIAS - keyPassword MYAPP_UPLOAD_KEY_PASSWORD - } -} } buildTypes { debug { @@ -235,7 +126,6 @@ android { // Caution! In production, you need to generate your own keystore file. // see https://reactnative.dev/docs/signed-apk-android. signingConfig signingConfigs.debug - signingConfig signingConfigs.release minifyEnabled enableProguardInReleaseBuilds proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" } @@ -259,65 +149,22 @@ android { } dependencies { - implementation fileTree(dir: "libs", include: ["*.jar"]) - - //noinspection GradleDynamicVersion - implementation "com.facebook.react:react-native:+" // From node_modules + // The version of react-native is set by the React Native Gradle Plugin + implementation("com.facebook.react:react-android") - implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0" - - debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") { - exclude group:'com.facebook.fbjni' - } + implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.0.0") + debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") { - exclude group:'com.facebook.flipper' exclude group:'com.squareup.okhttp3', module:'okhttp' } - debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}") { - exclude group:'com.facebook.flipper' - } - - if (enableHermes) { - //noinspection GradleDynamicVersion - implementation("com.facebook.react:hermes-engine:+") { // From node_modules - exclude group:'com.facebook.fbjni' - } + debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}") + if (hermesEnabled.toBoolean()) { + implementation("com.facebook.react:hermes-android") } else { implementation jscFlavor } } -if (isNewArchitectureEnabled()) { - // If new architecture is enabled, we let you build RN from source - // Otherwise we fallback to a prebuilt .aar bundled in the NPM package. - // This will be applied to all the imported transtitive dependency. - configurations.all { - resolutionStrategy.dependencySubstitution { - substitute(module("com.facebook.react:react-native")) - .using(project(":ReactAndroid")) - .because("On New Architecture we're building React Native from source") - substitute(module("com.facebook.react:hermes-engine")) - .using(project(":ReactAndroid:hermes-engine")) - .because("On New Architecture we're building Hermes from source") - } - } -} - -// Run this once to be able to run the application with BUCK -// puts all compile dependencies into folder libs for BUCK to use -task copyDownloadableDepsToLibs(type: Copy) { - from configurations.implementation - into 'libs' -} - apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project) - -def isNewArchitectureEnabled() { - // To opt-in for the New Architecture, you can either: - // - Set `newArchEnabled` to true inside the `gradle.properties` file - // - Invoke gradle with `-newArchEnabled=true` - // - Set an environment variable `ORG_GRADLE_PROJECT_newArchEnabled=true` - return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true" -} diff --git a/android/app/build_defs.bzl b/android/app/build_defs.bzl deleted file mode 100644 index fff270f..0000000 --- a/android/app/build_defs.bzl +++ /dev/null @@ -1,19 +0,0 @@ -"""Helper definitions to glob .aar and .jar targets""" - -def create_aar_targets(aarfiles): - for aarfile in aarfiles: - name = "aars__" + aarfile[aarfile.rindex("/") + 1:aarfile.rindex(".aar")] - lib_deps.append(":" + name) - android_prebuilt_aar( - name = name, - aar = aarfile, - ) - -def create_jar_targets(jarfiles): - for jarfile in jarfiles: - name = "jars__" + jarfile[jarfile.rindex("/") + 1:jarfile.rindex(".jar")] - lib_deps.append(":" + name) - prebuilt_jar( - name = name, - binary_jar = jarfile, - ) diff --git a/android/app/src/debug/java/com/owlrangenotes/ReactNativeFlipper.java b/android/app/src/debug/java/com/studynon/ReactNativeFlipper.java similarity index 93% rename from android/app/src/debug/java/com/owlrangenotes/ReactNativeFlipper.java rename to android/app/src/debug/java/com/studynon/ReactNativeFlipper.java index c6e06dd..2cfd7d4 100644 --- a/android/app/src/debug/java/com/owlrangenotes/ReactNativeFlipper.java +++ b/android/app/src/debug/java/com/studynon/ReactNativeFlipper.java @@ -4,7 +4,7 @@ *

This source code is licensed under the MIT license found in the LICENSE file in the root * directory of this source tree. */ -package com.owlrangenotes; +package com.studynon; import android.content.Context; import com.facebook.flipper.android.AndroidFlipperClient; @@ -17,7 +17,6 @@ import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin; import com.facebook.flipper.plugins.network.FlipperOkhttpInterceptor; import com.facebook.flipper.plugins.network.NetworkFlipperPlugin; -import com.facebook.flipper.plugins.react.ReactFlipperPlugin; import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesFlipperPlugin; import com.facebook.react.ReactInstanceEventListener; import com.facebook.react.ReactInstanceManager; @@ -25,13 +24,16 @@ import com.facebook.react.modules.network.NetworkingModule; import okhttp3.OkHttpClient; +/** + * Class responsible of loading Flipper inside your React Native application. This is the debug + * flavor of it. Here you can add your own plugins and customize the Flipper setup. + */ public class ReactNativeFlipper { public static void initializeFlipper(Context context, ReactInstanceManager reactInstanceManager) { if (FlipperUtils.shouldEnableFlipper(context)) { final FlipperClient client = AndroidFlipperClient.getInstance(context); client.addPlugin(new InspectorFlipperPlugin(context, DescriptorMapping.withDefaults())); - client.addPlugin(new ReactFlipperPlugin()); client.addPlugin(new DatabasesFlipperPlugin(context)); client.addPlugin(new SharedPreferencesFlipperPlugin(context)); client.addPlugin(CrashReporterPlugin.getInstance()); diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 9f43dbe..4122f36 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - + diff --git a/android/app/src/main/java/com/owlrangenotes/MainActivity.java b/android/app/src/main/java/com/owlrangenotes/MainActivity.java deleted file mode 100644 index 555b4f3..0000000 --- a/android/app/src/main/java/com/owlrangenotes/MainActivity.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.owlrangenotes; - -import com.facebook.react.ReactActivity; -import com.facebook.react.ReactActivityDelegate; -import com.facebook.react.ReactRootView; - -public class MainActivity extends ReactActivity { - - /** - * Returns the name of the main component registered from JavaScript. This is used to schedule - * rendering of the component. - */ - @Override - protected String getMainComponentName() { - return "OwlrangeNotes"; - } - - /** - * Returns the instance of the {@link ReactActivityDelegate}. There the RootView is created and - * you can specify the renderer you wish to use - the new renderer (Fabric) or the old renderer - * (Paper). - */ - @Override - protected ReactActivityDelegate createReactActivityDelegate() { - return new MainActivityDelegate(this, getMainComponentName()); - } - - public static class MainActivityDelegate extends ReactActivityDelegate { - public MainActivityDelegate(ReactActivity activity, String mainComponentName) { - super(activity, mainComponentName); - } - - @Override - protected ReactRootView createRootView() { - ReactRootView reactRootView = new ReactRootView(getContext()); - // If you opted-in for the New Architecture, we enable the Fabric Renderer. - reactRootView.setIsFabric(BuildConfig.IS_NEW_ARCHITECTURE_ENABLED); - return reactRootView; - } - - @Override - protected boolean isConcurrentRootEnabled() { - // If you opted-in for the New Architecture, we enable Concurrent Root (i.e. React 18). - // More on this on https://reactjs.org/blog/2022/03/29/react-v18.html - return BuildConfig.IS_NEW_ARCHITECTURE_ENABLED; - } - } -} diff --git a/android/app/src/main/java/com/owlrangenotes/MainApplication.java b/android/app/src/main/java/com/owlrangenotes/MainApplication.java deleted file mode 100644 index 8d1294e..0000000 --- a/android/app/src/main/java/com/owlrangenotes/MainApplication.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.owlrangenotes; - -import android.app.Application; -import android.content.Context; -import com.facebook.react.PackageList; -import com.facebook.react.ReactApplication; -import com.facebook.react.ReactInstanceManager; -import com.facebook.react.ReactNativeHost; -import com.facebook.react.ReactPackage; -import com.facebook.react.config.ReactFeatureFlags; -import com.facebook.soloader.SoLoader; -import com.owlrangenotes.newarchitecture.MainApplicationReactNativeHost; -import java.lang.reflect.InvocationTargetException; -import java.util.List; - -public class MainApplication extends Application implements ReactApplication { - - private final ReactNativeHost mReactNativeHost = - new ReactNativeHost(this) { - @Override - public boolean getUseDeveloperSupport() { - return BuildConfig.DEBUG; - } - - @Override - protected List getPackages() { - @SuppressWarnings("UnnecessaryLocalVariable") - List packages = new PackageList(this).getPackages(); - // Packages that cannot be autolinked yet can be added manually here, for example: - // packages.add(new MyReactNativePackage()); - return packages; - } - - @Override - protected String getJSMainModuleName() { - return "index"; - } - }; - - private final ReactNativeHost mNewArchitectureNativeHost = - new MainApplicationReactNativeHost(this); - - @Override - public ReactNativeHost getReactNativeHost() { - if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) { - return mNewArchitectureNativeHost; - } else { - return mReactNativeHost; - } - } - - @Override - public void onCreate() { - super.onCreate(); - // If you opted-in for the New Architecture, we enable the TurboModule system - ReactFeatureFlags.useTurboModules = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED; - SoLoader.init(this, /* native exopackage */ false); - initializeFlipper(this, getReactNativeHost().getReactInstanceManager()); - } - - /** - * Loads Flipper in React Native templates. Call this in the onCreate method with something like - * initializeFlipper(this, getReactNativeHost().getReactInstanceManager()); - * - * @param context - * @param reactInstanceManager - */ - private static void initializeFlipper( - Context context, ReactInstanceManager reactInstanceManager) { - if (BuildConfig.DEBUG) { - try { - /* - We use reflection here to pick up the class that initializes Flipper, - since Flipper library is not available in release mode - */ - Class aClass = Class.forName("com.owlrangenotes.ReactNativeFlipper"); - aClass - .getMethod("initializeFlipper", Context.class, ReactInstanceManager.class) - .invoke(null, context, reactInstanceManager); - } catch (ClassNotFoundException e) { - e.printStackTrace(); - } catch (NoSuchMethodException e) { - e.printStackTrace(); - } catch (IllegalAccessException e) { - e.printStackTrace(); - } catch (InvocationTargetException e) { - e.printStackTrace(); - } - } - } -} diff --git a/android/app/src/main/java/com/owlrangenotes/newarchitecture/MainApplicationReactNativeHost.java b/android/app/src/main/java/com/owlrangenotes/newarchitecture/MainApplicationReactNativeHost.java deleted file mode 100644 index 8e06538..0000000 --- a/android/app/src/main/java/com/owlrangenotes/newarchitecture/MainApplicationReactNativeHost.java +++ /dev/null @@ -1,116 +0,0 @@ -package com.owlrangenotes.newarchitecture; - -import android.app.Application; -import androidx.annotation.NonNull; -import com.facebook.react.PackageList; -import com.facebook.react.ReactInstanceManager; -import com.facebook.react.ReactNativeHost; -import com.facebook.react.ReactPackage; -import com.facebook.react.ReactPackageTurboModuleManagerDelegate; -import com.facebook.react.bridge.JSIModulePackage; -import com.facebook.react.bridge.JSIModuleProvider; -import com.facebook.react.bridge.JSIModuleSpec; -import com.facebook.react.bridge.JSIModuleType; -import com.facebook.react.bridge.JavaScriptContextHolder; -import com.facebook.react.bridge.ReactApplicationContext; -import com.facebook.react.bridge.UIManager; -import com.facebook.react.fabric.ComponentFactory; -import com.facebook.react.fabric.CoreComponentsRegistry; -import com.facebook.react.fabric.FabricJSIModuleProvider; -import com.facebook.react.fabric.ReactNativeConfig; -import com.facebook.react.uimanager.ViewManagerRegistry; -import com.owlrangenotes.BuildConfig; -import com.owlrangenotes.newarchitecture.components.MainComponentsRegistry; -import com.owlrangenotes.newarchitecture.modules.MainApplicationTurboModuleManagerDelegate; -import java.util.ArrayList; -import java.util.List; - -/** - * A {@link ReactNativeHost} that helps you load everything needed for the New Architecture, both - * TurboModule delegates and the Fabric Renderer. - * - *

Please note that this class is used ONLY if you opt-in for the New Architecture (see the - * `newArchEnabled` property). Is ignored otherwise. - */ -public class MainApplicationReactNativeHost extends ReactNativeHost { - public MainApplicationReactNativeHost(Application application) { - super(application); - } - - @Override - public boolean getUseDeveloperSupport() { - return BuildConfig.DEBUG; - } - - @Override - protected List getPackages() { - List packages = new PackageList(this).getPackages(); - // Packages that cannot be autolinked yet can be added manually here, for example: - // packages.add(new MyReactNativePackage()); - // TurboModules must also be loaded here providing a valid TurboReactPackage implementation: - // packages.add(new TurboReactPackage() { ... }); - // If you have custom Fabric Components, their ViewManagers should also be loaded here - // inside a ReactPackage. - return packages; - } - - @Override - protected String getJSMainModuleName() { - return "index"; - } - - @NonNull - @Override - protected ReactPackageTurboModuleManagerDelegate.Builder - getReactPackageTurboModuleManagerDelegateBuilder() { - // Here we provide the ReactPackageTurboModuleManagerDelegate Builder. This is necessary - // for the new architecture and to use TurboModules correctly. - return new MainApplicationTurboModuleManagerDelegate.Builder(); - } - - @Override - protected JSIModulePackage getJSIModulePackage() { - return new JSIModulePackage() { - @Override - public List getJSIModules( - final ReactApplicationContext reactApplicationContext, - final JavaScriptContextHolder jsContext) { - final List specs = new ArrayList<>(); - - // Here we provide a new JSIModuleSpec that will be responsible of providing the - // custom Fabric Components. - specs.add( - new JSIModuleSpec() { - @Override - public JSIModuleType getJSIModuleType() { - return JSIModuleType.UIManager; - } - - @Override - public JSIModuleProvider getJSIModuleProvider() { - final ComponentFactory componentFactory = new ComponentFactory(); - CoreComponentsRegistry.register(componentFactory); - - // Here we register a Components Registry. - // The one that is generated with the template contains no components - // and just provides you the one from React Native core. - MainComponentsRegistry.register(componentFactory); - - final ReactInstanceManager reactInstanceManager = getReactInstanceManager(); - - ViewManagerRegistry viewManagerRegistry = - new ViewManagerRegistry( - reactInstanceManager.getOrCreateViewManagers(reactApplicationContext)); - - return new FabricJSIModuleProvider( - reactApplicationContext, - componentFactory, - ReactNativeConfig.DEFAULT_CONFIG, - viewManagerRegistry); - } - }); - return specs; - } - }; - } -} diff --git a/android/app/src/main/java/com/owlrangenotes/newarchitecture/components/MainComponentsRegistry.java b/android/app/src/main/java/com/owlrangenotes/newarchitecture/components/MainComponentsRegistry.java deleted file mode 100644 index 7dabedf..0000000 --- a/android/app/src/main/java/com/owlrangenotes/newarchitecture/components/MainComponentsRegistry.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.owlrangenotes.newarchitecture.components; - -import com.facebook.jni.HybridData; -import com.facebook.proguard.annotations.DoNotStrip; -import com.facebook.react.fabric.ComponentFactory; -import com.facebook.soloader.SoLoader; - -/** - * Class responsible to load the custom Fabric Components. This class has native methods and needs a - * corresponding C++ implementation/header file to work correctly (already placed inside the jni/ - * folder for you). - * - *

Please note that this class is used ONLY if you opt-in for the New Architecture (see the - * `newArchEnabled` property). Is ignored otherwise. - */ -@DoNotStrip -public class MainComponentsRegistry { - static { - SoLoader.loadLibrary("fabricjni"); - } - - @DoNotStrip private final HybridData mHybridData; - - @DoNotStrip - private native HybridData initHybrid(ComponentFactory componentFactory); - - @DoNotStrip - private MainComponentsRegistry(ComponentFactory componentFactory) { - mHybridData = initHybrid(componentFactory); - } - - @DoNotStrip - public static MainComponentsRegistry register(ComponentFactory componentFactory) { - return new MainComponentsRegistry(componentFactory); - } -} diff --git a/android/app/src/main/java/com/owlrangenotes/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate.java b/android/app/src/main/java/com/owlrangenotes/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate.java deleted file mode 100644 index deaa2b9..0000000 --- a/android/app/src/main/java/com/owlrangenotes/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.owlrangenotes.newarchitecture.modules; - -import com.facebook.jni.HybridData; -import com.facebook.react.ReactPackage; -import com.facebook.react.ReactPackageTurboModuleManagerDelegate; -import com.facebook.react.bridge.ReactApplicationContext; -import com.facebook.soloader.SoLoader; -import java.util.List; - -/** - * Class responsible to load the TurboModules. This class has native methods and needs a - * corresponding C++ implementation/header file to work correctly (already placed inside the jni/ - * folder for you). - * - *

Please note that this class is used ONLY if you opt-in for the New Architecture (see the - * `newArchEnabled` property). Is ignored otherwise. - */ -public class MainApplicationTurboModuleManagerDelegate - extends ReactPackageTurboModuleManagerDelegate { - - private static volatile boolean sIsSoLibraryLoaded; - - protected MainApplicationTurboModuleManagerDelegate( - ReactApplicationContext reactApplicationContext, List packages) { - super(reactApplicationContext, packages); - } - - protected native HybridData initHybrid(); - - native boolean canCreateTurboModule(String moduleName); - - public static class Builder extends ReactPackageTurboModuleManagerDelegate.Builder { - protected MainApplicationTurboModuleManagerDelegate build( - ReactApplicationContext context, List packages) { - return new MainApplicationTurboModuleManagerDelegate(context, packages); - } - } - - @Override - protected synchronized void maybeLoadOtherSoLibraries() { - if (!sIsSoLibraryLoaded) { - // If you change the name of your application .so file in the Android.mk file, - // make sure you update the name here as well. - SoLoader.loadLibrary("owlrangenotes_appmodules"); - sIsSoLibraryLoaded = true; - } - } -} diff --git a/android/app/src/main/java/com/studynon/MainActivity.java b/android/app/src/main/java/com/studynon/MainActivity.java new file mode 100644 index 0000000..11f201a --- /dev/null +++ b/android/app/src/main/java/com/studynon/MainActivity.java @@ -0,0 +1,35 @@ +package com.studynon; + +import com.facebook.react.ReactActivity; +import com.facebook.react.ReactActivityDelegate; +import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint; +import com.facebook.react.defaults.DefaultReactActivityDelegate; + +public class MainActivity extends ReactActivity { + + /** + * Returns the name of the main component registered from JavaScript. This is used to schedule + * rendering of the component. + */ + @Override + protected String getMainComponentName() { + return "StudynON"; + } + + /** + * Returns the instance of the {@link ReactActivityDelegate}. Here we use a util class {@link + * DefaultReactActivityDelegate} which allows you to easily enable Fabric and Concurrent React + * (aka React 18) with two boolean flags. + */ + @Override + protected ReactActivityDelegate createReactActivityDelegate() { + return new DefaultReactActivityDelegate( + this, + getMainComponentName(), + // If you opted-in for the New Architecture, we enable the Fabric Renderer. + DefaultNewArchitectureEntryPoint.getFabricEnabled(), // fabricEnabled + // If you opted-in for the New Architecture, we enable Concurrent React (i.e. React 18). + DefaultNewArchitectureEntryPoint.getConcurrentReactEnabled() // concurrentRootEnabled + ); + } +} diff --git a/android/app/src/main/java/com/studynon/MainApplication.java b/android/app/src/main/java/com/studynon/MainApplication.java new file mode 100644 index 0000000..0795b7f --- /dev/null +++ b/android/app/src/main/java/com/studynon/MainApplication.java @@ -0,0 +1,62 @@ +package com.studynon; + +import android.app.Application; +import com.facebook.react.PackageList; +import com.facebook.react.ReactApplication; +import com.facebook.react.ReactNativeHost; +import com.facebook.react.ReactPackage; +import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint; +import com.facebook.react.defaults.DefaultReactNativeHost; +import com.facebook.soloader.SoLoader; +import java.util.List; + +public class MainApplication extends Application implements ReactApplication { + + private final ReactNativeHost mReactNativeHost = + new DefaultReactNativeHost(this) { + @Override + public boolean getUseDeveloperSupport() { + return BuildConfig.DEBUG; + } + + @Override + protected List getPackages() { + @SuppressWarnings("UnnecessaryLocalVariable") + List packages = new PackageList(this).getPackages(); + // Packages that cannot be autolinked yet can be added manually here, for example: + // packages.add(new MyReactNativePackage()); + return packages; + } + + @Override + protected String getJSMainModuleName() { + return "index"; + } + + @Override + protected boolean isNewArchEnabled() { + return BuildConfig.IS_NEW_ARCHITECTURE_ENABLED; + } + + @Override + protected Boolean isHermesEnabled() { + return BuildConfig.IS_HERMES_ENABLED; + } + }; + + @Override + public ReactNativeHost getReactNativeHost() { + return mReactNativeHost; + } + + @Override + public void onCreate() { + super.onCreate(); + SoLoader.init(this, /* native exopackage */ false); + if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) { + // If you opted-in for the New Architecture, we load the native entry point for this app. + DefaultNewArchitectureEntryPoint.load(); + } + ReactNativeFlipper.initializeFlipper(this, getReactNativeHost().getReactInstanceManager()); + } +} diff --git a/android/app/src/main/jni/CMakeLists.txt b/android/app/src/main/jni/CMakeLists.txt deleted file mode 100644 index 0c4044f..0000000 --- a/android/app/src/main/jni/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -cmake_minimum_required(VERSION 3.13) - -# Define the library name here. -project(owlrangenotes_appmodules) - -# This file includes all the necessary to let you build your application with the New Architecture. -include(${REACT_ANDROID_DIR}/cmake-utils/ReactNative-application.cmake) diff --git a/android/app/src/main/jni/MainApplicationModuleProvider.cpp b/android/app/src/main/jni/MainApplicationModuleProvider.cpp deleted file mode 100644 index 26162dd..0000000 --- a/android/app/src/main/jni/MainApplicationModuleProvider.cpp +++ /dev/null @@ -1,32 +0,0 @@ -#include "MainApplicationModuleProvider.h" - -#include -#include - -namespace facebook { -namespace react { - -std::shared_ptr MainApplicationModuleProvider( - const std::string &moduleName, - const JavaTurboModule::InitParams ¶ms) { - // Here you can provide your own module provider for TurboModules coming from - // either your application or from external libraries. The approach to follow - // is similar to the following (for a library called `samplelibrary`: - // - // auto module = samplelibrary_ModuleProvider(moduleName, params); - // if (module != nullptr) { - // return module; - // } - // return rncore_ModuleProvider(moduleName, params); - - // Module providers autolinked by RN CLI - auto rncli_module = rncli_ModuleProvider(moduleName, params); - if (rncli_module != nullptr) { - return rncli_module; - } - - return rncore_ModuleProvider(moduleName, params); -} - -} // namespace react -} // namespace facebook diff --git a/android/app/src/main/jni/MainApplicationModuleProvider.h b/android/app/src/main/jni/MainApplicationModuleProvider.h deleted file mode 100644 index b38ccf5..0000000 --- a/android/app/src/main/jni/MainApplicationModuleProvider.h +++ /dev/null @@ -1,16 +0,0 @@ -#pragma once - -#include -#include - -#include - -namespace facebook { -namespace react { - -std::shared_ptr MainApplicationModuleProvider( - const std::string &moduleName, - const JavaTurboModule::InitParams ¶ms); - -} // namespace react -} // namespace facebook diff --git a/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp b/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp deleted file mode 100644 index 5fd688c..0000000 --- a/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp +++ /dev/null @@ -1,45 +0,0 @@ -#include "MainApplicationTurboModuleManagerDelegate.h" -#include "MainApplicationModuleProvider.h" - -namespace facebook { -namespace react { - -jni::local_ref -MainApplicationTurboModuleManagerDelegate::initHybrid( - jni::alias_ref) { - return makeCxxInstance(); -} - -void MainApplicationTurboModuleManagerDelegate::registerNatives() { - registerHybrid({ - makeNativeMethod( - "initHybrid", MainApplicationTurboModuleManagerDelegate::initHybrid), - makeNativeMethod( - "canCreateTurboModule", - MainApplicationTurboModuleManagerDelegate::canCreateTurboModule), - }); -} - -std::shared_ptr -MainApplicationTurboModuleManagerDelegate::getTurboModule( - const std::string &name, - const std::shared_ptr &jsInvoker) { - // Not implemented yet: provide pure-C++ NativeModules here. - return nullptr; -} - -std::shared_ptr -MainApplicationTurboModuleManagerDelegate::getTurboModule( - const std::string &name, - const JavaTurboModule::InitParams ¶ms) { - return MainApplicationModuleProvider(name, params); -} - -bool MainApplicationTurboModuleManagerDelegate::canCreateTurboModule( - const std::string &name) { - return getTurboModule(name, nullptr) != nullptr || - getTurboModule(name, {.moduleName = name}) != nullptr; -} - -} // namespace react -} // namespace facebook diff --git a/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h b/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h deleted file mode 100644 index 37ac824..0000000 --- a/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h +++ /dev/null @@ -1,38 +0,0 @@ -#include -#include - -#include -#include - -namespace facebook { -namespace react { - -class MainApplicationTurboModuleManagerDelegate - : public jni::HybridClass< - MainApplicationTurboModuleManagerDelegate, - TurboModuleManagerDelegate> { - public: - // Adapt it to the package you used for your Java class. - static constexpr auto kJavaDescriptor = - "Lcom/owlrangenotes/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate;"; - - static jni::local_ref initHybrid(jni::alias_ref); - - static void registerNatives(); - - std::shared_ptr getTurboModule( - const std::string &name, - const std::shared_ptr &jsInvoker) override; - std::shared_ptr getTurboModule( - const std::string &name, - const JavaTurboModule::InitParams ¶ms) override; - - /** - * Test-only method. Allows user to verify whether a TurboModule can be - * created by instances of this class. - */ - bool canCreateTurboModule(const std::string &name); -}; - -} // namespace react -} // namespace facebook diff --git a/android/app/src/main/jni/MainComponentsRegistry.cpp b/android/app/src/main/jni/MainComponentsRegistry.cpp deleted file mode 100644 index 54f598a..0000000 --- a/android/app/src/main/jni/MainComponentsRegistry.cpp +++ /dev/null @@ -1,65 +0,0 @@ -#include "MainComponentsRegistry.h" - -#include -#include -#include -#include -#include - -namespace facebook { -namespace react { - -MainComponentsRegistry::MainComponentsRegistry(ComponentFactory *delegate) {} - -std::shared_ptr -MainComponentsRegistry::sharedProviderRegistry() { - auto providerRegistry = CoreComponentsRegistry::sharedProviderRegistry(); - - // Autolinked providers registered by RN CLI - rncli_registerProviders(providerRegistry); - - // Custom Fabric Components go here. You can register custom - // components coming from your App or from 3rd party libraries here. - // - // providerRegistry->add(concreteComponentDescriptorProvider< - // AocViewerComponentDescriptor>()); - return providerRegistry; -} - -jni::local_ref -MainComponentsRegistry::initHybrid( - jni::alias_ref, - ComponentFactory *delegate) { - auto instance = makeCxxInstance(delegate); - - auto buildRegistryFunction = - [](EventDispatcher::Weak const &eventDispatcher, - ContextContainer::Shared const &contextContainer) - -> ComponentDescriptorRegistry::Shared { - auto registry = MainComponentsRegistry::sharedProviderRegistry() - ->createComponentDescriptorRegistry( - {eventDispatcher, contextContainer}); - - auto mutableRegistry = - std::const_pointer_cast(registry); - - mutableRegistry->setFallbackComponentDescriptor( - std::make_shared( - ComponentDescriptorParameters{ - eventDispatcher, contextContainer, nullptr})); - - return registry; - }; - - delegate->buildRegistryFunction = buildRegistryFunction; - return instance; -} - -void MainComponentsRegistry::registerNatives() { - registerHybrid({ - makeNativeMethod("initHybrid", MainComponentsRegistry::initHybrid), - }); -} - -} // namespace react -} // namespace facebook diff --git a/android/app/src/main/jni/MainComponentsRegistry.h b/android/app/src/main/jni/MainComponentsRegistry.h deleted file mode 100644 index 32bcfff..0000000 --- a/android/app/src/main/jni/MainComponentsRegistry.h +++ /dev/null @@ -1,32 +0,0 @@ -#pragma once - -#include -#include -#include -#include - -namespace facebook { -namespace react { - -class MainComponentsRegistry - : public facebook::jni::HybridClass { - public: - // Adapt it to the package you used for your Java class. - constexpr static auto kJavaDescriptor = - "Lcom/owlrangenotes/newarchitecture/components/MainComponentsRegistry;"; - - static void registerNatives(); - - MainComponentsRegistry(ComponentFactory *delegate); - - private: - static std::shared_ptr - sharedProviderRegistry(); - - static jni::local_ref initHybrid( - jni::alias_ref, - ComponentFactory *delegate); -}; - -} // namespace react -} // namespace facebook diff --git a/android/app/src/main/jni/OnLoad.cpp b/android/app/src/main/jni/OnLoad.cpp deleted file mode 100644 index c569b6e..0000000 --- a/android/app/src/main/jni/OnLoad.cpp +++ /dev/null @@ -1,11 +0,0 @@ -#include -#include "MainApplicationTurboModuleManagerDelegate.h" -#include "MainComponentsRegistry.h" - -JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) { - return facebook::jni::initialize(vm, [] { - facebook::react::MainApplicationTurboModuleManagerDelegate:: - registerNatives(); - facebook::react::MainComponentsRegistry::registerNatives(); - }); -} diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index 517f727..def94f1 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -1,3 +1,3 @@ - OwlrangeNotes + StudynON diff --git a/android/app/src/release/java/com/studynon/ReactNativeFlipper.java b/android/app/src/release/java/com/studynon/ReactNativeFlipper.java new file mode 100644 index 0000000..f5a556f --- /dev/null +++ b/android/app/src/release/java/com/studynon/ReactNativeFlipper.java @@ -0,0 +1,20 @@ +/** + * 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.studynon; + +import android.content.Context; +import com.facebook.react.ReactInstanceManager; + +/** + * Class responsible of loading Flipper inside your React Native application. This is the release + * flavor of it so it's empty as we don't want to load Flipper. + */ +public class ReactNativeFlipper { + public static void initializeFlipper(Context context, ReactInstanceManager reactInstanceManager) { + // Do nothing as we don't want to initialize Flipper on Release. + } +} diff --git a/android/build.gradle b/android/build.gradle index 8569fee..67d887b 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -2,50 +2,20 @@ buildscript { ext { - buildToolsVersion = "31.0.0" + buildToolsVersion = "33.0.0" minSdkVersion = 21 - compileSdkVersion = 31 - targetSdkVersion = 31 + compileSdkVersion = 33 + targetSdkVersion = 33 - if (System.properties['os.arch'] == "aarch64") { - // For M1 Users we need to use the NDK 24 which added support for aarch64 - ndkVersion = "24.0.8215888" - } else { - // Otherwise we default to the side-by-side NDK version from AGP. - ndkVersion = "21.4.7075529" - } + // We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP. + ndkVersion = "23.1.7779620" } repositories { google() mavenCentral() } dependencies { - classpath("com.android.tools.build:gradle:7.2.1") + classpath("com.android.tools.build:gradle:7.3.1") classpath("com.facebook.react:react-native-gradle-plugin") - classpath("de.undercouch:gradle-download-task:5.0.1") - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files - } -} - -allprojects { - repositories { - maven { - // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm - url("$rootDir/../node_modules/react-native/android") - } - maven { - // Android JSC is installed from npm - url("$rootDir/../node_modules/jsc-android/dist") - } - mavenCentral { - // We don't want to fetch react-native from Maven Central as there are - // older versions over there. - content { - excludeGroup "com.facebook.react" - } - } - google() - maven { url 'https://www.jitpack.io' } } } diff --git a/android/gradle.properties b/android/gradle.properties index 52bcb93..634a6d9 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -38,7 +38,12 @@ reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64 # to write custom TurboModules/Fabric components OR use libraries that # are providing them. newArchEnabled=false + +# Use this property to enable or disable the Hermes JS engine. +# If set to false, you will be using JSC instead. +hermesEnabled=true + MYAPP_UPLOAD_STORE_FILE=my-upload-key.keystore MYAPP_UPLOAD_KEY_ALIAS=my-key-alias MYAPP_UPLOAD_STORE_PASSWORD=123456 -MYAPP_UPLOAD_KEY_PASSWORD=123456 \ No newline at end of file +MYAPP_UPLOAD_KEY_PASSWORD=123456 diff --git a/android/settings.gradle b/android/settings.gradle index e85ed16..633505d 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -1,11 +1,4 @@ -rootProject.name = 'OwlrangeNotes' +rootProject.name = 'StudynON' apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings) include ':app' includeBuild('../node_modules/react-native-gradle-plugin') - -if (settings.hasProperty("newArchEnabled") && settings.newArchEnabled == "true") { - include(":ReactAndroid") - project(":ReactAndroid").projectDir = file('../node_modules/react-native/ReactAndroid') - include(":ReactAndroid:hermes-engine") - project(":ReactAndroid:hermes-engine").projectDir = file('../node_modules/react-native/ReactAndroid/hermes-engine') -} diff --git a/app.json b/app.json index 2259954..06a4bb1 100644 --- a/app.json +++ b/app.json @@ -1,4 +1,4 @@ { - "name": "OwlrangeNotes", - "displayName": "OwlrangeNotes" -} \ No newline at end of file + "name": "StudynON", + "displayName": "Studyn'ON" +} diff --git a/ios/OwlrangeNotes.xcworkspace/contents.xcworkspacedata b/ios/OwlrangeNotes.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 1555b1f..0000000 --- a/ios/OwlrangeNotes.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - diff --git a/ios/OwlrangeNotes.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ios/OwlrangeNotes.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d9810..0000000 --- a/ios/OwlrangeNotes.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/ios/OwlrangeNotes/AppDelegate.h b/ios/OwlrangeNotes/AppDelegate.h deleted file mode 100644 index ef1de86..0000000 --- a/ios/OwlrangeNotes/AppDelegate.h +++ /dev/null @@ -1,8 +0,0 @@ -#import -#import - -@interface AppDelegate : UIResponder - -@property (nonatomic, strong) UIWindow *window; - -@end diff --git a/ios/OwlrangeNotes/AppDelegate.mm b/ios/OwlrangeNotes/AppDelegate.mm deleted file mode 100644 index 0a4d877..0000000 --- a/ios/OwlrangeNotes/AppDelegate.mm +++ /dev/null @@ -1,133 +0,0 @@ -#import "AppDelegate.h" - -#import -#import -#import - -#import - -#if RCT_NEW_ARCH_ENABLED -#import -#import -#import -#import -#import -#import - -#import - -static NSString *const kRNConcurrentRoot = @"concurrentRoot"; - -@interface AppDelegate () { - RCTTurboModuleManager *_turboModuleManager; - RCTSurfacePresenterBridgeAdapter *_bridgeAdapter; - std::shared_ptr _reactNativeConfig; - facebook::react::ContextContainer::Shared _contextContainer; -} -@end -#endif - -@implementation AppDelegate - -- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions -{ - RCTAppSetupPrepareApp(application); - - RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions]; - -#if RCT_NEW_ARCH_ENABLED - _contextContainer = std::make_shared(); - _reactNativeConfig = std::make_shared(); - _contextContainer->insert("ReactNativeConfig", _reactNativeConfig); - _bridgeAdapter = [[RCTSurfacePresenterBridgeAdapter alloc] initWithBridge:bridge contextContainer:_contextContainer]; - bridge.surfacePresenter = _bridgeAdapter.surfacePresenter; -#endif - - NSDictionary *initProps = [self prepareInitialProps]; - UIView *rootView = RCTAppSetupDefaultRootView(bridge, @"OwlrangeNotes", initProps); - - if (@available(iOS 13.0, *)) { - rootView.backgroundColor = [UIColor systemBackgroundColor]; - } else { - rootView.backgroundColor = [UIColor whiteColor]; - } - - self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds]; - UIViewController *rootViewController = [UIViewController new]; - rootViewController.view = rootView; - self.window.rootViewController = rootViewController; - [self.window makeKeyAndVisible]; - return YES; -} - -/// This method controls whether the `concurrentRoot`feature of React18 is turned on or off. -/// -/// @see: https://reactjs.org/blog/2022/03/29/react-v18.html -/// @note: This requires to be rendering on Fabric (i.e. on the New Architecture). -/// @return: `true` if the `concurrentRoot` feture is enabled. Otherwise, it returns `false`. -- (BOOL)concurrentRootEnabled -{ - // Switch this bool to turn on and off the concurrent root - return true; -} - -- (NSDictionary *)prepareInitialProps -{ - NSMutableDictionary *initProps = [NSMutableDictionary new]; - -#ifdef RCT_NEW_ARCH_ENABLED - initProps[kRNConcurrentRoot] = @([self concurrentRootEnabled]); -#endif - - return initProps; -} - -- (NSURL *)sourceURLForBridge:(RCTBridge *)bridge -{ -#if DEBUG - return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index"]; -#else - return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"]; -#endif -} - -#if RCT_NEW_ARCH_ENABLED - -#pragma mark - RCTCxxBridgeDelegate - -- (std::unique_ptr)jsExecutorFactoryForBridge:(RCTBridge *)bridge -{ - _turboModuleManager = [[RCTTurboModuleManager alloc] initWithBridge:bridge - delegate:self - jsInvoker:bridge.jsCallInvoker]; - return RCTAppSetupDefaultJsExecutorFactory(bridge, _turboModuleManager); -} - -#pragma mark RCTTurboModuleManagerDelegate - -- (Class)getModuleClassFromName:(const char *)name -{ - return RCTCoreModulesClassProvider(name); -} - -- (std::shared_ptr)getTurboModule:(const std::string &)name - jsInvoker:(std::shared_ptr)jsInvoker -{ - return nullptr; -} - -- (std::shared_ptr)getTurboModule:(const std::string &)name - initParams: - (const facebook::react::ObjCTurboModule::InitParams &)params -{ - return nullptr; -} - -- (id)getModuleInstanceFromClass:(Class)moduleClass -{ - return RCTAppSetupDefaultModuleFromClass(moduleClass); -} - -#endif - -@end diff --git a/ios/Podfile b/ios/Podfile index f75465b..0eeb85e 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -1,10 +1,27 @@ require_relative '../node_modules/react-native/scripts/react_native_pods' require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules' -platform :ios, '12.4' -install! 'cocoapods', :deterministic_uuids => false +platform :ios, min_ios_version_supported +prepare_react_native_project! -target 'OwlrangeNotes' do +# If you are using a `react-native-flipper` your iOS build will fail when `NO_FLIPPER=1` is set. +# because `react-native-flipper` depends on (FlipperKit,...) that will be excluded +# +# To fix this you can also exclude `react-native-flipper` using a `react-native.config.js` +# ```js +# module.exports = { +# dependencies: { +# ...(process.env.NO_FLIPPER ? { 'react-native-flipper': { platforms: { ios: null } } } : {}), +# ``` +flipper_config = ENV['NO_FLIPPER'] == "1" ? FlipperConfiguration.disabled : FlipperConfiguration.enabled + +linkage = ENV['USE_FRAMEWORKS'] +if linkage != nil + Pod::UI.puts "Configuring Pod with #{linkage}ally linked Frameworks".green + use_frameworks! :linkage => linkage.to_sym +end + +target 'StudynON' do config = use_native_modules! # Flags change depending on the env values. @@ -15,18 +32,18 @@ target 'OwlrangeNotes' do # Hermes is now enabled by default. Disable by setting this flag to false. # Upcoming versions of React Native may rely on get_default_flags(), but # we make it explicit here to aid in the React Native upgrade process. - :hermes_enabled => true, + :hermes_enabled => flags[:hermes_enabled], :fabric_enabled => flags[:fabric_enabled], # Enables Flipper. # # Note that if you have use_frameworks! enabled, Flipper will not work and # you should disable the next line. - :flipper_configuration => FlipperConfiguration.enabled, + :flipper_configuration => flipper_config, # An absolute path to your application root. :app_path => "#{Pod::Config.instance.installation_root}/.." ) - target 'OwlrangeNotesTests' do + target 'StudynONTests' do inherit! :complete # Pods for testing end diff --git a/ios/Podfile.lock b/ios/Podfile.lock deleted file mode 100644 index a42cb27..0000000 --- a/ios/Podfile.lock +++ /dev/null @@ -1,642 +0,0 @@ -PODS: - - boost (1.76.0) - - CocoaAsyncSocket (7.6.5) - - DoubleConversion (1.1.6) - - FBLazyVector (0.70.3) - - FBReactNativeSpec (0.70.3): - - RCT-Folly (= 2021.07.22.00) - - RCTRequired (= 0.70.3) - - RCTTypeSafety (= 0.70.3) - - React-Core (= 0.70.3) - - React-jsi (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - Flipper (0.125.0): - - Flipper-Folly (~> 2.6) - - Flipper-RSocket (~> 1.4) - - Flipper-Boost-iOSX (1.76.0.1.11) - - Flipper-DoubleConversion (3.2.0.1) - - Flipper-Fmt (7.1.7) - - Flipper-Folly (2.6.10): - - Flipper-Boost-iOSX - - Flipper-DoubleConversion - - Flipper-Fmt (= 7.1.7) - - Flipper-Glog - - libevent (~> 2.1.12) - - OpenSSL-Universal (= 1.1.1100) - - Flipper-Glog (0.5.0.5) - - Flipper-PeerTalk (0.0.4) - - Flipper-RSocket (1.4.3): - - Flipper-Folly (~> 2.6) - - FlipperKit (0.125.0): - - FlipperKit/Core (= 0.125.0) - - FlipperKit/Core (0.125.0): - - Flipper (~> 0.125.0) - - FlipperKit/CppBridge - - FlipperKit/FBCxxFollyDynamicConvert - - FlipperKit/FBDefines - - FlipperKit/FKPortForwarding - - SocketRocket (~> 0.6.0) - - FlipperKit/CppBridge (0.125.0): - - Flipper (~> 0.125.0) - - FlipperKit/FBCxxFollyDynamicConvert (0.125.0): - - Flipper-Folly (~> 2.6) - - FlipperKit/FBDefines (0.125.0) - - FlipperKit/FKPortForwarding (0.125.0): - - CocoaAsyncSocket (~> 7.6) - - Flipper-PeerTalk (~> 0.0.4) - - FlipperKit/FlipperKitHighlightOverlay (0.125.0) - - FlipperKit/FlipperKitLayoutHelpers (0.125.0): - - FlipperKit/Core - - FlipperKit/FlipperKitHighlightOverlay - - FlipperKit/FlipperKitLayoutTextSearchable - - FlipperKit/FlipperKitLayoutIOSDescriptors (0.125.0): - - FlipperKit/Core - - FlipperKit/FlipperKitHighlightOverlay - - FlipperKit/FlipperKitLayoutHelpers - - YogaKit (~> 1.18) - - FlipperKit/FlipperKitLayoutPlugin (0.125.0): - - FlipperKit/Core - - FlipperKit/FlipperKitHighlightOverlay - - FlipperKit/FlipperKitLayoutHelpers - - FlipperKit/FlipperKitLayoutIOSDescriptors - - FlipperKit/FlipperKitLayoutTextSearchable - - YogaKit (~> 1.18) - - FlipperKit/FlipperKitLayoutTextSearchable (0.125.0) - - FlipperKit/FlipperKitNetworkPlugin (0.125.0): - - FlipperKit/Core - - FlipperKit/FlipperKitReactPlugin (0.125.0): - - FlipperKit/Core - - FlipperKit/FlipperKitUserDefaultsPlugin (0.125.0): - - FlipperKit/Core - - FlipperKit/SKIOSNetworkPlugin (0.125.0): - - FlipperKit/Core - - FlipperKit/FlipperKitNetworkPlugin - - fmt (6.2.1) - - glog (0.3.5) - - hermes-engine (0.70.3) - - libevent (2.1.12) - - lottie-ios (3.4.4) - - lottie-react-native (5.1.4): - - lottie-ios (~> 3.4.0) - - React-Core - - OpenSSL-Universal (1.1.1100) - - RCT-Folly (2021.07.22.00): - - boost - - DoubleConversion - - fmt (~> 6.2.1) - - glog - - RCT-Folly/Default (= 2021.07.22.00) - - RCT-Folly/Default (2021.07.22.00): - - boost - - DoubleConversion - - fmt (~> 6.2.1) - - glog - - RCT-Folly/Futures (2021.07.22.00): - - boost - - DoubleConversion - - fmt (~> 6.2.1) - - glog - - libevent - - RCTRequired (0.70.3) - - RCTTypeSafety (0.70.3): - - FBLazyVector (= 0.70.3) - - RCTRequired (= 0.70.3) - - React-Core (= 0.70.3) - - React (0.70.3): - - React-Core (= 0.70.3) - - React-Core/DevSupport (= 0.70.3) - - React-Core/RCTWebSocket (= 0.70.3) - - React-RCTActionSheet (= 0.70.3) - - React-RCTAnimation (= 0.70.3) - - React-RCTBlob (= 0.70.3) - - React-RCTImage (= 0.70.3) - - React-RCTLinking (= 0.70.3) - - React-RCTNetwork (= 0.70.3) - - React-RCTSettings (= 0.70.3) - - React-RCTText (= 0.70.3) - - React-RCTVibration (= 0.70.3) - - React-bridging (0.70.3): - - RCT-Folly (= 2021.07.22.00) - - React-jsi (= 0.70.3) - - React-callinvoker (0.70.3) - - React-Codegen (0.70.3): - - FBReactNativeSpec (= 0.70.3) - - RCT-Folly (= 2021.07.22.00) - - RCTRequired (= 0.70.3) - - RCTTypeSafety (= 0.70.3) - - React-Core (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-Core (0.70.3): - - glog - - RCT-Folly (= 2021.07.22.00) - - React-Core/Default (= 0.70.3) - - React-cxxreact (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - React-perflogger (= 0.70.3) - - Yoga - - React-Core/CoreModulesHeaders (0.70.3): - - glog - - RCT-Folly (= 2021.07.22.00) - - React-Core/Default - - React-cxxreact (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - React-perflogger (= 0.70.3) - - Yoga - - React-Core/Default (0.70.3): - - glog - - RCT-Folly (= 2021.07.22.00) - - React-cxxreact (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - React-perflogger (= 0.70.3) - - Yoga - - React-Core/DevSupport (0.70.3): - - glog - - RCT-Folly (= 2021.07.22.00) - - React-Core/Default (= 0.70.3) - - React-Core/RCTWebSocket (= 0.70.3) - - React-cxxreact (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - React-jsinspector (= 0.70.3) - - React-perflogger (= 0.70.3) - - Yoga - - React-Core/RCTActionSheetHeaders (0.70.3): - - glog - - RCT-Folly (= 2021.07.22.00) - - React-Core/Default - - React-cxxreact (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - React-perflogger (= 0.70.3) - - Yoga - - React-Core/RCTAnimationHeaders (0.70.3): - - glog - - RCT-Folly (= 2021.07.22.00) - - React-Core/Default - - React-cxxreact (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - React-perflogger (= 0.70.3) - - Yoga - - React-Core/RCTBlobHeaders (0.70.3): - - glog - - RCT-Folly (= 2021.07.22.00) - - React-Core/Default - - React-cxxreact (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - React-perflogger (= 0.70.3) - - Yoga - - React-Core/RCTImageHeaders (0.70.3): - - glog - - RCT-Folly (= 2021.07.22.00) - - React-Core/Default - - React-cxxreact (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - React-perflogger (= 0.70.3) - - Yoga - - React-Core/RCTLinkingHeaders (0.70.3): - - glog - - RCT-Folly (= 2021.07.22.00) - - React-Core/Default - - React-cxxreact (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - React-perflogger (= 0.70.3) - - Yoga - - React-Core/RCTNetworkHeaders (0.70.3): - - glog - - RCT-Folly (= 2021.07.22.00) - - React-Core/Default - - React-cxxreact (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - React-perflogger (= 0.70.3) - - Yoga - - React-Core/RCTSettingsHeaders (0.70.3): - - glog - - RCT-Folly (= 2021.07.22.00) - - React-Core/Default - - React-cxxreact (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - React-perflogger (= 0.70.3) - - Yoga - - React-Core/RCTTextHeaders (0.70.3): - - glog - - RCT-Folly (= 2021.07.22.00) - - React-Core/Default - - React-cxxreact (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - React-perflogger (= 0.70.3) - - Yoga - - React-Core/RCTVibrationHeaders (0.70.3): - - glog - - RCT-Folly (= 2021.07.22.00) - - React-Core/Default - - React-cxxreact (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - React-perflogger (= 0.70.3) - - Yoga - - React-Core/RCTWebSocket (0.70.3): - - glog - - RCT-Folly (= 2021.07.22.00) - - React-Core/Default (= 0.70.3) - - React-cxxreact (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - React-perflogger (= 0.70.3) - - Yoga - - React-CoreModules (0.70.3): - - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.70.3) - - React-Codegen (= 0.70.3) - - React-Core/CoreModulesHeaders (= 0.70.3) - - React-jsi (= 0.70.3) - - React-RCTImage (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-cxxreact (0.70.3): - - boost (= 1.76.0) - - DoubleConversion - - glog - - RCT-Folly (= 2021.07.22.00) - - React-callinvoker (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsinspector (= 0.70.3) - - React-logger (= 0.70.3) - - React-perflogger (= 0.70.3) - - React-runtimeexecutor (= 0.70.3) - - React-hermes (0.70.3): - - DoubleConversion - - glog - - hermes-engine - - RCT-Folly (= 2021.07.22.00) - - RCT-Folly/Futures (= 2021.07.22.00) - - React-cxxreact (= 0.70.3) - - React-jsi (= 0.70.3) - - React-jsiexecutor (= 0.70.3) - - React-jsinspector (= 0.70.3) - - React-perflogger (= 0.70.3) - - React-jsi (0.70.3): - - boost (= 1.76.0) - - DoubleConversion - - glog - - RCT-Folly (= 2021.07.22.00) - - React-jsi/Default (= 0.70.3) - - React-jsi/Default (0.70.3): - - boost (= 1.76.0) - - DoubleConversion - - glog - - RCT-Folly (= 2021.07.22.00) - - React-jsiexecutor (0.70.3): - - DoubleConversion - - glog - - RCT-Folly (= 2021.07.22.00) - - React-cxxreact (= 0.70.3) - - React-jsi (= 0.70.3) - - React-perflogger (= 0.70.3) - - React-jsinspector (0.70.3) - - React-logger (0.70.3): - - glog - - react-native-safe-area-context (4.4.1): - - RCT-Folly - - RCTRequired - - RCTTypeSafety - - React-Core - - ReactCommon/turbomodule/core - - React-perflogger (0.70.3) - - React-RCTActionSheet (0.70.3): - - React-Core/RCTActionSheetHeaders (= 0.70.3) - - React-RCTAnimation (0.70.3): - - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.70.3) - - React-Codegen (= 0.70.3) - - React-Core/RCTAnimationHeaders (= 0.70.3) - - React-jsi (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-RCTBlob (0.70.3): - - RCT-Folly (= 2021.07.22.00) - - React-Codegen (= 0.70.3) - - React-Core/RCTBlobHeaders (= 0.70.3) - - React-Core/RCTWebSocket (= 0.70.3) - - React-jsi (= 0.70.3) - - React-RCTNetwork (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-RCTImage (0.70.3): - - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.70.3) - - React-Codegen (= 0.70.3) - - React-Core/RCTImageHeaders (= 0.70.3) - - React-jsi (= 0.70.3) - - React-RCTNetwork (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-RCTLinking (0.70.3): - - React-Codegen (= 0.70.3) - - React-Core/RCTLinkingHeaders (= 0.70.3) - - React-jsi (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-RCTNetwork (0.70.3): - - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.70.3) - - React-Codegen (= 0.70.3) - - React-Core/RCTNetworkHeaders (= 0.70.3) - - React-jsi (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-RCTSettings (0.70.3): - - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.70.3) - - React-Codegen (= 0.70.3) - - React-Core/RCTSettingsHeaders (= 0.70.3) - - React-jsi (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-RCTText (0.70.3): - - React-Core/RCTTextHeaders (= 0.70.3) - - React-RCTVibration (0.70.3): - - RCT-Folly (= 2021.07.22.00) - - React-Codegen (= 0.70.3) - - React-Core/RCTVibrationHeaders (= 0.70.3) - - React-jsi (= 0.70.3) - - ReactCommon/turbomodule/core (= 0.70.3) - - React-runtimeexecutor (0.70.3): - - React-jsi (= 0.70.3) - - ReactCommon/turbomodule/core (0.70.3): - - DoubleConversion - - glog - - RCT-Folly (= 2021.07.22.00) - - React-bridging (= 0.70.3) - - React-callinvoker (= 0.70.3) - - React-Core (= 0.70.3) - - React-cxxreact (= 0.70.3) - - React-jsi (= 0.70.3) - - React-logger (= 0.70.3) - - React-perflogger (= 0.70.3) - - RNGestureHandler (2.8.0): - - React-Core - - RNReanimated (2.11.0): - - DoubleConversion - - FBLazyVector - - FBReactNativeSpec - - glog - - RCT-Folly - - RCTRequired - - RCTTypeSafety - - React-callinvoker - - React-Core - - React-Core/DevSupport - - React-Core/RCTWebSocket - - React-CoreModules - - React-cxxreact - - React-jsi - - React-jsiexecutor - - React-jsinspector - - React-RCTActionSheet - - React-RCTAnimation - - React-RCTBlob - - React-RCTImage - - React-RCTLinking - - React-RCTNetwork - - React-RCTSettings - - React-RCTText - - ReactCommon/turbomodule/core - - Yoga - - RNScreens (3.18.2): - - React-Core - - React-RCTImage - - SocketRocket (0.6.0) - - Yoga (1.14.0) - - YogaKit (1.18.1): - - Yoga (~> 1.14) - -DEPENDENCIES: - - boost (from `../node_modules/react-native/third-party-podspecs/boost.podspec`) - - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`) - - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`) - - FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`) - - Flipper (= 0.125.0) - - Flipper-Boost-iOSX (= 1.76.0.1.11) - - Flipper-DoubleConversion (= 3.2.0.1) - - Flipper-Fmt (= 7.1.7) - - Flipper-Folly (= 2.6.10) - - Flipper-Glog (= 0.5.0.5) - - Flipper-PeerTalk (= 0.0.4) - - Flipper-RSocket (= 1.4.3) - - FlipperKit (= 0.125.0) - - FlipperKit/Core (= 0.125.0) - - FlipperKit/CppBridge (= 0.125.0) - - FlipperKit/FBCxxFollyDynamicConvert (= 0.125.0) - - FlipperKit/FBDefines (= 0.125.0) - - FlipperKit/FKPortForwarding (= 0.125.0) - - FlipperKit/FlipperKitHighlightOverlay (= 0.125.0) - - FlipperKit/FlipperKitLayoutPlugin (= 0.125.0) - - FlipperKit/FlipperKitLayoutTextSearchable (= 0.125.0) - - FlipperKit/FlipperKitNetworkPlugin (= 0.125.0) - - FlipperKit/FlipperKitReactPlugin (= 0.125.0) - - FlipperKit/FlipperKitUserDefaultsPlugin (= 0.125.0) - - FlipperKit/SKIOSNetworkPlugin (= 0.125.0) - - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`) - - hermes-engine (from `../node_modules/react-native/sdks/hermes/hermes-engine.podspec`) - - libevent (~> 2.1.12) - - lottie-react-native (from `../node_modules/lottie-react-native`) - - OpenSSL-Universal (= 1.1.1100) - - RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`) - - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`) - - RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`) - - React (from `../node_modules/react-native/`) - - React-bridging (from `../node_modules/react-native/ReactCommon`) - - React-callinvoker (from `../node_modules/react-native/ReactCommon/callinvoker`) - - React-Codegen (from `build/generated/ios`) - - React-Core (from `../node_modules/react-native/`) - - React-Core/DevSupport (from `../node_modules/react-native/`) - - React-Core/RCTWebSocket (from `../node_modules/react-native/`) - - React-CoreModules (from `../node_modules/react-native/React/CoreModules`) - - React-cxxreact (from `../node_modules/react-native/ReactCommon/cxxreact`) - - React-hermes (from `../node_modules/react-native/ReactCommon/hermes`) - - React-jsi (from `../node_modules/react-native/ReactCommon/jsi`) - - React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`) - - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`) - - React-logger (from `../node_modules/react-native/ReactCommon/logger`) - - react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`) - - React-perflogger (from `../node_modules/react-native/ReactCommon/reactperflogger`) - - React-RCTActionSheet (from `../node_modules/react-native/Libraries/ActionSheetIOS`) - - React-RCTAnimation (from `../node_modules/react-native/Libraries/NativeAnimation`) - - React-RCTBlob (from `../node_modules/react-native/Libraries/Blob`) - - React-RCTImage (from `../node_modules/react-native/Libraries/Image`) - - React-RCTLinking (from `../node_modules/react-native/Libraries/LinkingIOS`) - - React-RCTNetwork (from `../node_modules/react-native/Libraries/Network`) - - React-RCTSettings (from `../node_modules/react-native/Libraries/Settings`) - - React-RCTText (from `../node_modules/react-native/Libraries/Text`) - - React-RCTVibration (from `../node_modules/react-native/Libraries/Vibration`) - - React-runtimeexecutor (from `../node_modules/react-native/ReactCommon/runtimeexecutor`) - - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`) - - RNGestureHandler (from `../node_modules/react-native-gesture-handler`) - - RNReanimated (from `../node_modules/react-native-reanimated`) - - RNScreens (from `../node_modules/react-native-screens`) - - Yoga (from `../node_modules/react-native/ReactCommon/yoga`) - -SPEC REPOS: - trunk: - - CocoaAsyncSocket - - Flipper - - Flipper-Boost-iOSX - - Flipper-DoubleConversion - - Flipper-Fmt - - Flipper-Folly - - Flipper-Glog - - Flipper-PeerTalk - - Flipper-RSocket - - FlipperKit - - fmt - - libevent - - lottie-ios - - OpenSSL-Universal - - SocketRocket - - YogaKit - -EXTERNAL SOURCES: - boost: - :podspec: "../node_modules/react-native/third-party-podspecs/boost.podspec" - DoubleConversion: - :podspec: "../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec" - FBLazyVector: - :path: "../node_modules/react-native/Libraries/FBLazyVector" - FBReactNativeSpec: - :path: "../node_modules/react-native/React/FBReactNativeSpec" - glog: - :podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec" - hermes-engine: - :podspec: "../node_modules/react-native/sdks/hermes/hermes-engine.podspec" - lottie-react-native: - :path: "../node_modules/lottie-react-native" - RCT-Folly: - :podspec: "../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec" - RCTRequired: - :path: "../node_modules/react-native/Libraries/RCTRequired" - RCTTypeSafety: - :path: "../node_modules/react-native/Libraries/TypeSafety" - React: - :path: "../node_modules/react-native/" - React-bridging: - :path: "../node_modules/react-native/ReactCommon" - React-callinvoker: - :path: "../node_modules/react-native/ReactCommon/callinvoker" - React-Codegen: - :path: build/generated/ios - React-Core: - :path: "../node_modules/react-native/" - React-CoreModules: - :path: "../node_modules/react-native/React/CoreModules" - React-cxxreact: - :path: "../node_modules/react-native/ReactCommon/cxxreact" - React-hermes: - :path: "../node_modules/react-native/ReactCommon/hermes" - React-jsi: - :path: "../node_modules/react-native/ReactCommon/jsi" - React-jsiexecutor: - :path: "../node_modules/react-native/ReactCommon/jsiexecutor" - React-jsinspector: - :path: "../node_modules/react-native/ReactCommon/jsinspector" - React-logger: - :path: "../node_modules/react-native/ReactCommon/logger" - react-native-safe-area-context: - :path: "../node_modules/react-native-safe-area-context" - React-perflogger: - :path: "../node_modules/react-native/ReactCommon/reactperflogger" - React-RCTActionSheet: - :path: "../node_modules/react-native/Libraries/ActionSheetIOS" - React-RCTAnimation: - :path: "../node_modules/react-native/Libraries/NativeAnimation" - React-RCTBlob: - :path: "../node_modules/react-native/Libraries/Blob" - React-RCTImage: - :path: "../node_modules/react-native/Libraries/Image" - React-RCTLinking: - :path: "../node_modules/react-native/Libraries/LinkingIOS" - React-RCTNetwork: - :path: "../node_modules/react-native/Libraries/Network" - React-RCTSettings: - :path: "../node_modules/react-native/Libraries/Settings" - React-RCTText: - :path: "../node_modules/react-native/Libraries/Text" - React-RCTVibration: - :path: "../node_modules/react-native/Libraries/Vibration" - React-runtimeexecutor: - :path: "../node_modules/react-native/ReactCommon/runtimeexecutor" - ReactCommon: - :path: "../node_modules/react-native/ReactCommon" - RNGestureHandler: - :path: "../node_modules/react-native-gesture-handler" - RNReanimated: - :path: "../node_modules/react-native-reanimated" - RNScreens: - :path: "../node_modules/react-native-screens" - Yoga: - :path: "../node_modules/react-native/ReactCommon/yoga" - -SPEC CHECKSUMS: - boost: a7c83b31436843459a1961bfd74b96033dc77234 - CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 - DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54 - FBLazyVector: 3b313c3fb52b597f7a9b430798e6367d2b9f07e5 - FBReactNativeSpec: 99a7ecb7e9665d96f2fea706b0844e2f3117f381 - Flipper: 26fc4b7382499f1281eb8cb921e5c3ad6de91fe0 - Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c - Flipper-DoubleConversion: 2dc99b02f658daf147069aad9dbd29d8feb06d30 - Flipper-Fmt: 60cbdd92fc254826e61d669a5d87ef7015396a9b - Flipper-Folly: 584845625005ff068a6ebf41f857f468decd26b3 - Flipper-Glog: 70c50ce58ddaf67dc35180db05f191692570f446 - Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 - Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541 - FlipperKit: cbdee19bdd4e7f05472a66ce290f1b729ba3cb86 - fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 - glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b - hermes-engine: bb344d89a0d14c2c91ad357480a79698bb80e186 - libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 - lottie-ios: 8f97d3271e155c2d688875c29cd3c74908aef5f8 - lottie-react-native: b702fab740cdb952a8e2354713d3beda63ff97b0 - OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c - RCT-Folly: 0080d0a6ebf2577475bda044aa59e2ca1f909cda - RCTRequired: 5cf7e7d2f12699724b59f90350257a422eaa9492 - RCTTypeSafety: 3f3ead9673d1ab8bb1aea85b0894ab3220f8f06e - React: 30a333798d1fcf595e8a4108bbaa0f125a655f4a - React-bridging: 92396c03ab446756ddfb7a8e2baff3bcf19eec7d - React-callinvoker: bb66a41b41fa0b7c5f3cc626693a63c9ea0d6252 - React-Codegen: a2a944a9688fae870be0a2ecdca37284034b25c2 - React-Core: a689b4d1bd13e15915a05c9918c2b01df96cd811 - React-CoreModules: d262214db6b704b042bc5c0735b06c346a371d7f - React-cxxreact: 81d5bf256313bf96cb925eb0e654103291161a17 - React-hermes: 1c35cbfbdc7a888c3a1aa05e6d0ca004d92c923c - React-jsi: 7f99dc3055bec9a0eeb4230f8b6ac873514c8421 - React-jsiexecutor: 7e2e1772ef7b97168c880eeaf3749d8c145ffd6e - React-jsinspector: 0553c9fe7218e1f127be070bd5a4d2fc19fb8190 - React-logger: cffcc09e8aba8a3014be8d18da7f922802e9f19e - react-native-safe-area-context: 99b24a0c5acd0d5dcac2b1a7f18c49ea317be99a - React-perflogger: 082b4293f0b3914ff41da35a6c06ac4490fcbcc8 - React-RCTActionSheet: 83da3030deb5dea54b398129f56540a44e64d3ae - React-RCTAnimation: bac3a4f4c0436554d9f7fbb1352a0cdcb1fb0f1c - React-RCTBlob: d2c8830ac6b4d55d5624469829fe6d0ef1d534d1 - React-RCTImage: 26ad032b09f90ae5d2283ec19f0c455c444c8189 - React-RCTLinking: 4a8d16586df11fff515a6c52ff51a02c47a20499 - React-RCTNetwork: 843fc75a70f0b5760de0bf59468585f41209bcf0 - React-RCTSettings: 54e59255f94462951b45f84c3f81aedc27cf8615 - React-RCTText: c32e2a60827bd232b2bc95941b9926ccf1c2be4c - React-RCTVibration: b9a58ffdd18446f43d493a4b0ecd603ee86be847 - React-runtimeexecutor: e9b1f9310158a1e265bcdfdfd8c62d6174b947a2 - ReactCommon: 01064177e66d652192c661de899b1076da962fd9 - RNGestureHandler: 62232ba8f562f7dea5ba1b3383494eb5bf97a4d3 - RNReanimated: ad7ac300e516348c8136ffec8957f24d3d6c378e - RNScreens: 34cc502acf1b916c582c60003dc3089fa01dc66d - SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608 - Yoga: 2ed968a4f060a92834227c036279f2736de0fce3 - YogaKit: f782866e155069a2cca2517aafea43200b01fd5a - -PODFILE CHECKSUM: bcd9973191b56083f2ae440f32ae1197190142c8 - -COCOAPODS: 1.11.3 diff --git a/ios/OwlrangeNotes.xcodeproj/project.pbxproj b/ios/StudynON.xcodeproj/project.pbxproj similarity index 60% rename from ios/OwlrangeNotes.xcodeproj/project.pbxproj rename to ios/StudynON.xcodeproj/project.pbxproj index 74a534b..563a5f9 100644 --- a/ios/OwlrangeNotes.xcodeproj/project.pbxproj +++ b/ios/StudynON.xcodeproj/project.pbxproj @@ -7,25 +7,25 @@ objects = { /* Begin PBXBuildFile section */ - 00E356F31AD99517003FC87E /* OwlrangeNotesTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* OwlrangeNotesTests.m */; }; - 0C80B921A6F3F58F76C31292 /* libPods-OwlrangeNotes.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5DCACB8F33CDC322A6C60F78 /* libPods-OwlrangeNotes.a */; }; + 00E356F31AD99517003FC87E /* StudynONTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* StudynONTests.m */; }; + 0C80B921A6F3F58F76C31292 /* libPods-StudynON.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5DCACB8F33CDC322A6C60F78 /* libPods-StudynON.a */; }; 13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; }; 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; - 146B9FC049BF4EAA97567258 /* Roboto-BlackItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = D13D4453555E44E0BF2D5B14 /* Roboto-BlackItalic.ttf */; }; - 1D3A563DF8334567B861617E /* Roboto-Light.ttf in Resources */ = {isa = PBXBuildFile; fileRef = A33EF2EFAFFC4FA1983D5E3A /* Roboto-Light.ttf */; }; - 28E08914C520493B9E9EB0F1 /* Roboto-Black.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 8C64E66B007B4E3AA3B89EEE /* Roboto-Black.ttf */; }; - 296E31DBFD98494CB25AB8E2 /* Roboto-LightItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = AB9B8EE430B346848E782298 /* Roboto-LightItalic.ttf */; }; - 2D5721C65B9942C58FA65D3C /* Roboto-MediumItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = D68D47D5F7454B4191EA6F79 /* Roboto-MediumItalic.ttf */; }; - 50DF45EED6064E79BB4E22E6 /* Roboto-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = DE997C7F306E4B2885D21B59 /* Roboto-Bold.ttf */; }; - 6FB8464FD55849EEA0C3F3B8 /* Roboto-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = CDE07B04040A44A4B615D456 /* Roboto-Regular.ttf */; }; - 7699B88040F8A987B510C191 /* libPods-OwlrangeNotes-OwlrangeNotesTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 19F6CBCC0A4E27FBF8BF4A61 /* libPods-OwlrangeNotes-OwlrangeNotesTests.a */; }; + 7699B88040F8A987B510C191 /* libPods-StudynON-StudynONTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 19F6CBCC0A4E27FBF8BF4A61 /* libPods-StudynON-StudynONTests.a */; }; 81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; }; - 8979254EB3104CABA7D4C557 /* Roboto-ThinItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = FC9C239E03954B278B7BD80B /* Roboto-ThinItalic.ttf */; }; - 8ABD7FA23782420FB354940E /* Roboto-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 1794325C59E44FB19CE7D8A0 /* Roboto-Medium.ttf */; }; - D64409009C1045A5B48D83DF /* Roboto-Italic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 0E64CB0BBF3243DF85271A8C /* Roboto-Italic.ttf */; }; - D6E82206E7D04118BBB99F25 /* Roboto-Thin.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 8A2E3E65C94249A3895647F2 /* Roboto-Thin.ttf */; }; - F37349ADDE8F45DABDA48703 /* Roboto-BoldItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6181CF975BF445ADA1668289 /* Roboto-BoldItalic.ttf */; }; + A364C00E2C6647958E849762 /* Roboto-Black.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 182F6C2AB6BB43C3A250EC21 /* Roboto-Black.ttf */; }; + 7A5456501A184C5C97B7CD5E /* Roboto-BlackItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 90359C25A20B4A2A840064D3 /* Roboto-BlackItalic.ttf */; }; + 63903E8CC1EC437A8D56AC96 /* Roboto-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = F28938A6EAF641D593312423 /* Roboto-Bold.ttf */; }; + 7759005732204525AA85BA49 /* Roboto-BoldItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 557BC6CA42FE4B6ABF4394AA /* Roboto-BoldItalic.ttf */; }; + 5E073E03A0824B11AA6FD017 /* Roboto-Italic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 8A8F280DF640432796EDAB4E /* Roboto-Italic.ttf */; }; + 8744E5F71B8D40A691E4ABB9 /* Roboto-Light.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 41A4B4C6B2D94DD396855127 /* Roboto-Light.ttf */; }; + 0B13F8F1D0624026873BC7E9 /* Roboto-LightItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 1DC094531B384A5BA828158C /* Roboto-LightItalic.ttf */; }; + 7EABF86BDCF64D70BEDD36AD /* Roboto-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = CFA3A73C32894AB89F3AE387 /* Roboto-Medium.ttf */; }; + 1C5E16D1E3694D748ADD7A14 /* Roboto-MediumItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = CDB20D7649EB4C18AD238AD0 /* Roboto-MediumItalic.ttf */; }; + 4DD5EBD111E74DA7941FC317 /* Roboto-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 11524F7E67F94999A7D3AC65 /* Roboto-Regular.ttf */; }; + ED93396516124282ACD2DA06 /* Roboto-Thin.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 4F7F1D2ADC5D4364AC876703 /* Roboto-Thin.ttf */; }; + A137FA57FB1B451199C6C093 /* Roboto-ThinItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 515C9DEB801C48A397DA7EA3 /* Roboto-ThinItalic.ttf */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -34,40 +34,40 @@ containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */; proxyType = 1; remoteGlobalIDString = 13B07F861A680F5B00A75B9A; - remoteInfo = OwlrangeNotes; + remoteInfo = StudynON; }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 00E356EE1AD99517003FC87E /* OwlrangeNotesTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = OwlrangeNotesTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 00E356EE1AD99517003FC87E /* StudynONTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = StudynONTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 00E356F21AD99517003FC87E /* OwlrangeNotesTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OwlrangeNotesTests.m; sourceTree = ""; }; - 0E64CB0BBF3243DF85271A8C /* Roboto-Italic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-Italic.ttf"; path = "../assets/fonts/Roboto-Italic.ttf"; sourceTree = ""; }; - 13B07F961A680F5B00A75B9A /* OwlrangeNotes.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = OwlrangeNotes.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = OwlrangeNotes/AppDelegate.h; sourceTree = ""; }; - 13B07FB01A68108700A75B9A /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = OwlrangeNotes/AppDelegate.mm; sourceTree = ""; }; - 13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = OwlrangeNotes/Images.xcassets; sourceTree = ""; }; - 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = OwlrangeNotes/Info.plist; sourceTree = ""; }; - 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = OwlrangeNotes/main.m; sourceTree = ""; }; - 1794325C59E44FB19CE7D8A0 /* Roboto-Medium.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-Medium.ttf"; path = "../assets/fonts/Roboto-Medium.ttf"; sourceTree = ""; }; - 19F6CBCC0A4E27FBF8BF4A61 /* libPods-OwlrangeNotes-OwlrangeNotesTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-OwlrangeNotes-OwlrangeNotesTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - 3B4392A12AC88292D35C810B /* Pods-OwlrangeNotes.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OwlrangeNotes.debug.xcconfig"; path = "Target Support Files/Pods-OwlrangeNotes/Pods-OwlrangeNotes.debug.xcconfig"; sourceTree = ""; }; - 5709B34CF0A7D63546082F79 /* Pods-OwlrangeNotes.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OwlrangeNotes.release.xcconfig"; path = "Target Support Files/Pods-OwlrangeNotes/Pods-OwlrangeNotes.release.xcconfig"; sourceTree = ""; }; - 5B7EB9410499542E8C5724F5 /* Pods-OwlrangeNotes-OwlrangeNotesTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OwlrangeNotes-OwlrangeNotesTests.debug.xcconfig"; path = "Target Support Files/Pods-OwlrangeNotes-OwlrangeNotesTests/Pods-OwlrangeNotes-OwlrangeNotesTests.debug.xcconfig"; sourceTree = ""; }; - 5DCACB8F33CDC322A6C60F78 /* libPods-OwlrangeNotes.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-OwlrangeNotes.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - 6181CF975BF445ADA1668289 /* Roboto-BoldItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-BoldItalic.ttf"; path = "../assets/fonts/Roboto-BoldItalic.ttf"; sourceTree = ""; }; - 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = OwlrangeNotes/LaunchScreen.storyboard; sourceTree = ""; }; - 89C6BE57DB24E9ADA2F236DE /* Pods-OwlrangeNotes-OwlrangeNotesTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OwlrangeNotes-OwlrangeNotesTests.release.xcconfig"; path = "Target Support Files/Pods-OwlrangeNotes-OwlrangeNotesTests/Pods-OwlrangeNotes-OwlrangeNotesTests.release.xcconfig"; sourceTree = ""; }; - 8A2E3E65C94249A3895647F2 /* Roboto-Thin.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-Thin.ttf"; path = "../assets/fonts/Roboto-Thin.ttf"; sourceTree = ""; }; - 8C64E66B007B4E3AA3B89EEE /* Roboto-Black.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-Black.ttf"; path = "../assets/fonts/Roboto-Black.ttf"; sourceTree = ""; }; - A33EF2EFAFFC4FA1983D5E3A /* Roboto-Light.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-Light.ttf"; path = "../assets/fonts/Roboto-Light.ttf"; sourceTree = ""; }; - AB9B8EE430B346848E782298 /* Roboto-LightItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-LightItalic.ttf"; path = "../assets/fonts/Roboto-LightItalic.ttf"; sourceTree = ""; }; - CDE07B04040A44A4B615D456 /* Roboto-Regular.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-Regular.ttf"; path = "../assets/fonts/Roboto-Regular.ttf"; sourceTree = ""; }; - D13D4453555E44E0BF2D5B14 /* Roboto-BlackItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-BlackItalic.ttf"; path = "../assets/fonts/Roboto-BlackItalic.ttf"; sourceTree = ""; }; - D68D47D5F7454B4191EA6F79 /* Roboto-MediumItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-MediumItalic.ttf"; path = "../assets/fonts/Roboto-MediumItalic.ttf"; sourceTree = ""; }; - DE997C7F306E4B2885D21B59 /* Roboto-Bold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-Bold.ttf"; path = "../assets/fonts/Roboto-Bold.ttf"; sourceTree = ""; }; + 00E356F21AD99517003FC87E /* StudynONTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = StudynONTests.m; sourceTree = ""; }; + 13B07F961A680F5B00A75B9A /* StudynON.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = StudynON.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = StudynON/AppDelegate.h; sourceTree = ""; }; + 13B07FB01A68108700A75B9A /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = StudynON/AppDelegate.mm; sourceTree = ""; }; + 13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = StudynON/Images.xcassets; sourceTree = ""; }; + 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = StudynON/Info.plist; sourceTree = ""; }; + 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = StudynON/main.m; sourceTree = ""; }; + 19F6CBCC0A4E27FBF8BF4A61 /* libPods-StudynON-StudynONTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-StudynON-StudynONTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 3B4392A12AC88292D35C810B /* Pods-StudynON.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-StudynON.debug.xcconfig"; path = "Target Support Files/Pods-StudynON/Pods-StudynON.debug.xcconfig"; sourceTree = ""; }; + 5709B34CF0A7D63546082F79 /* Pods-StudynON.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-StudynON.release.xcconfig"; path = "Target Support Files/Pods-StudynON/Pods-StudynON.release.xcconfig"; sourceTree = ""; }; + 5B7EB9410499542E8C5724F5 /* Pods-StudynON-StudynONTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-StudynON-StudynONTests.debug.xcconfig"; path = "Target Support Files/Pods-StudynON-StudynONTests/Pods-StudynON-StudynONTests.debug.xcconfig"; sourceTree = ""; }; + 5DCACB8F33CDC322A6C60F78 /* libPods-StudynON.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-StudynON.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = StudynON/LaunchScreen.storyboard; sourceTree = ""; }; + 89C6BE57DB24E9ADA2F236DE /* Pods-StudynON-StudynONTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-StudynON-StudynONTests.release.xcconfig"; path = "Target Support Files/Pods-StudynON-StudynONTests/Pods-StudynON-StudynONTests.release.xcconfig"; sourceTree = ""; }; ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; - FC9C239E03954B278B7BD80B /* Roboto-ThinItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-ThinItalic.ttf"; path = "../assets/fonts/Roboto-ThinItalic.ttf"; sourceTree = ""; }; + 182F6C2AB6BB43C3A250EC21 /* Roboto-Black.ttf */ = {isa = PBXFileReference; name = "Roboto-Black.ttf"; path = "../assets/fonts/Roboto-Black.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 90359C25A20B4A2A840064D3 /* Roboto-BlackItalic.ttf */ = {isa = PBXFileReference; name = "Roboto-BlackItalic.ttf"; path = "../assets/fonts/Roboto-BlackItalic.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + F28938A6EAF641D593312423 /* Roboto-Bold.ttf */ = {isa = PBXFileReference; name = "Roboto-Bold.ttf"; path = "../assets/fonts/Roboto-Bold.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 557BC6CA42FE4B6ABF4394AA /* Roboto-BoldItalic.ttf */ = {isa = PBXFileReference; name = "Roboto-BoldItalic.ttf"; path = "../assets/fonts/Roboto-BoldItalic.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 8A8F280DF640432796EDAB4E /* Roboto-Italic.ttf */ = {isa = PBXFileReference; name = "Roboto-Italic.ttf"; path = "../assets/fonts/Roboto-Italic.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 41A4B4C6B2D94DD396855127 /* Roboto-Light.ttf */ = {isa = PBXFileReference; name = "Roboto-Light.ttf"; path = "../assets/fonts/Roboto-Light.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 1DC094531B384A5BA828158C /* Roboto-LightItalic.ttf */ = {isa = PBXFileReference; name = "Roboto-LightItalic.ttf"; path = "../assets/fonts/Roboto-LightItalic.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + CFA3A73C32894AB89F3AE387 /* Roboto-Medium.ttf */ = {isa = PBXFileReference; name = "Roboto-Medium.ttf"; path = "../assets/fonts/Roboto-Medium.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + CDB20D7649EB4C18AD238AD0 /* Roboto-MediumItalic.ttf */ = {isa = PBXFileReference; name = "Roboto-MediumItalic.ttf"; path = "../assets/fonts/Roboto-MediumItalic.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 11524F7E67F94999A7D3AC65 /* Roboto-Regular.ttf */ = {isa = PBXFileReference; name = "Roboto-Regular.ttf"; path = "../assets/fonts/Roboto-Regular.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 4F7F1D2ADC5D4364AC876703 /* Roboto-Thin.ttf */ = {isa = PBXFileReference; name = "Roboto-Thin.ttf"; path = "../assets/fonts/Roboto-Thin.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 515C9DEB801C48A397DA7EA3 /* Roboto-ThinItalic.ttf */ = {isa = PBXFileReference; name = "Roboto-ThinItalic.ttf"; path = "../assets/fonts/Roboto-ThinItalic.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -75,7 +75,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 7699B88040F8A987B510C191 /* libPods-OwlrangeNotes-OwlrangeNotesTests.a in Frameworks */, + 7699B88040F8A987B510C191 /* libPods-StudynON-StudynONTests.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -83,20 +83,20 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 0C80B921A6F3F58F76C31292 /* libPods-OwlrangeNotes.a in Frameworks */, + 0C80B921A6F3F58F76C31292 /* libPods-StudynON.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 00E356EF1AD99517003FC87E /* OwlrangeNotesTests */ = { + 00E356EF1AD99517003FC87E /* StudynONTests */ = { isa = PBXGroup; children = ( - 00E356F21AD99517003FC87E /* OwlrangeNotesTests.m */, + 00E356F21AD99517003FC87E /* StudynONTests.m */, 00E356F01AD99517003FC87E /* Supporting Files */, ); - path = OwlrangeNotesTests; + path = StudynONTests; sourceTree = ""; }; 00E356F01AD99517003FC87E /* Supporting Files */ = { @@ -107,7 +107,7 @@ name = "Supporting Files"; sourceTree = ""; }; - 13B07FAE1A68108700A75B9A /* OwlrangeNotes */ = { + 13B07FAE1A68108700A75B9A /* StudynON */ = { isa = PBXGroup; children = ( 13B07FAF1A68108700A75B9A /* AppDelegate.h */, @@ -117,15 +117,15 @@ 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */, 13B07FB71A68108700A75B9A /* main.m */, ); - name = OwlrangeNotes; + name = StudynON; sourceTree = ""; }; 2D16E6871FA4F8E400B85C8A /* Frameworks */ = { isa = PBXGroup; children = ( ED297162215061F000B7C4FE /* JavaScriptCore.framework */, - 5DCACB8F33CDC322A6C60F78 /* libPods-OwlrangeNotes.a */, - 19F6CBCC0A4E27FBF8BF4A61 /* libPods-OwlrangeNotes-OwlrangeNotesTests.a */, + 5DCACB8F33CDC322A6C60F78 /* libPods-StudynON.a */, + 19F6CBCC0A4E27FBF8BF4A61 /* libPods-StudynON-StudynONTests.a */, ); name = Frameworks; sourceTree = ""; @@ -140,13 +140,13 @@ 83CBB9F61A601CBA00E9B192 = { isa = PBXGroup; children = ( - 13B07FAE1A68108700A75B9A /* OwlrangeNotes */, + 13B07FAE1A68108700A75B9A /* StudynON */, 832341AE1AAA6A7D00B99B32 /* Libraries */, - 00E356EF1AD99517003FC87E /* OwlrangeNotesTests */, + 00E356EF1AD99517003FC87E /* StudynONTests */, 83CBBA001A601CBA00E9B192 /* Products */, 2D16E6871FA4F8E400B85C8A /* Frameworks */, BBD78D7AC51CEA395F1C20DB /* Pods */, - 888346671E5E4D398D62A471 /* Resources */, + 5313C5CB838C4F51B897FC8D /* Resources */, ); indentWidth = 2; sourceTree = ""; @@ -156,49 +156,49 @@ 83CBBA001A601CBA00E9B192 /* Products */ = { isa = PBXGroup; children = ( - 13B07F961A680F5B00A75B9A /* OwlrangeNotes.app */, - 00E356EE1AD99517003FC87E /* OwlrangeNotesTests.xctest */, + 13B07F961A680F5B00A75B9A /* StudynON.app */, + 00E356EE1AD99517003FC87E /* StudynONTests.xctest */, ); name = Products; sourceTree = ""; }; - 888346671E5E4D398D62A471 /* Resources */ = { + BBD78D7AC51CEA395F1C20DB /* Pods */ = { isa = PBXGroup; children = ( - 8C64E66B007B4E3AA3B89EEE /* Roboto-Black.ttf */, - D13D4453555E44E0BF2D5B14 /* Roboto-BlackItalic.ttf */, - DE997C7F306E4B2885D21B59 /* Roboto-Bold.ttf */, - 6181CF975BF445ADA1668289 /* Roboto-BoldItalic.ttf */, - 0E64CB0BBF3243DF85271A8C /* Roboto-Italic.ttf */, - A33EF2EFAFFC4FA1983D5E3A /* Roboto-Light.ttf */, - AB9B8EE430B346848E782298 /* Roboto-LightItalic.ttf */, - 1794325C59E44FB19CE7D8A0 /* Roboto-Medium.ttf */, - D68D47D5F7454B4191EA6F79 /* Roboto-MediumItalic.ttf */, - CDE07B04040A44A4B615D456 /* Roboto-Regular.ttf */, - 8A2E3E65C94249A3895647F2 /* Roboto-Thin.ttf */, - FC9C239E03954B278B7BD80B /* Roboto-ThinItalic.ttf */, + 3B4392A12AC88292D35C810B /* Pods-StudynON.debug.xcconfig */, + 5709B34CF0A7D63546082F79 /* Pods-StudynON.release.xcconfig */, + 5B7EB9410499542E8C5724F5 /* Pods-StudynON-StudynONTests.debug.xcconfig */, + 89C6BE57DB24E9ADA2F236DE /* Pods-StudynON-StudynONTests.release.xcconfig */, ); - name = Resources; - path = ""; + path = Pods; sourceTree = ""; }; - BBD78D7AC51CEA395F1C20DB /* Pods */ = { - isa = PBXGroup; + 5313C5CB838C4F51B897FC8D /* Resources */ = { + isa = "PBXGroup"; children = ( - 3B4392A12AC88292D35C810B /* Pods-OwlrangeNotes.debug.xcconfig */, - 5709B34CF0A7D63546082F79 /* Pods-OwlrangeNotes.release.xcconfig */, - 5B7EB9410499542E8C5724F5 /* Pods-OwlrangeNotes-OwlrangeNotesTests.debug.xcconfig */, - 89C6BE57DB24E9ADA2F236DE /* Pods-OwlrangeNotes-OwlrangeNotesTests.release.xcconfig */, + 182F6C2AB6BB43C3A250EC21 /* Roboto-Black.ttf */, + 90359C25A20B4A2A840064D3 /* Roboto-BlackItalic.ttf */, + F28938A6EAF641D593312423 /* Roboto-Bold.ttf */, + 557BC6CA42FE4B6ABF4394AA /* Roboto-BoldItalic.ttf */, + 8A8F280DF640432796EDAB4E /* Roboto-Italic.ttf */, + 41A4B4C6B2D94DD396855127 /* Roboto-Light.ttf */, + 1DC094531B384A5BA828158C /* Roboto-LightItalic.ttf */, + CFA3A73C32894AB89F3AE387 /* Roboto-Medium.ttf */, + CDB20D7649EB4C18AD238AD0 /* Roboto-MediumItalic.ttf */, + 11524F7E67F94999A7D3AC65 /* Roboto-Regular.ttf */, + 4F7F1D2ADC5D4364AC876703 /* Roboto-Thin.ttf */, + 515C9DEB801C48A397DA7EA3 /* Roboto-ThinItalic.ttf */, ); - path = Pods; + name = Resources; sourceTree = ""; + path = ""; }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 00E356ED1AD99517003FC87E /* OwlrangeNotesTests */ = { + 00E356ED1AD99517003FC87E /* StudynONTests */ = { isa = PBXNativeTarget; - buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "OwlrangeNotesTests" */; + buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "StudynONTests" */; buildPhases = ( A55EABD7B0C7F3A422A6CC61 /* [CP] Check Pods Manifest.lock */, 00E356EA1AD99517003FC87E /* Sources */, @@ -212,14 +212,14 @@ dependencies = ( 00E356F51AD99517003FC87E /* PBXTargetDependency */, ); - name = OwlrangeNotesTests; - productName = OwlrangeNotesTests; - productReference = 00E356EE1AD99517003FC87E /* OwlrangeNotesTests.xctest */; + name = StudynONTests; + productName = StudynONTests; + productReference = 00E356EE1AD99517003FC87E /* StudynONTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; - 13B07F861A680F5B00A75B9A /* OwlrangeNotes */ = { + 13B07F861A680F5B00A75B9A /* StudynON */ = { isa = PBXNativeTarget; - buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "OwlrangeNotes" */; + buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "StudynON" */; buildPhases = ( C38B50BA6285516D6DCD4F65 /* [CP] Check Pods Manifest.lock */, FD10A7F022414F080027D42C /* Start Packager */, @@ -234,9 +234,9 @@ ); dependencies = ( ); - name = OwlrangeNotes; - productName = OwlrangeNotes; - productReference = 13B07F961A680F5B00A75B9A /* OwlrangeNotes.app */; + name = StudynON; + productName = StudynON; + productReference = 13B07F961A680F5B00A75B9A /* StudynON.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -256,7 +256,7 @@ }; }; }; - buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "OwlrangeNotes" */; + buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "StudynON" */; compatibilityVersion = "Xcode 12.0"; developmentRegion = en; hasScannedForEncodings = 0; @@ -269,8 +269,8 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 13B07F861A680F5B00A75B9A /* OwlrangeNotes */, - 00E356ED1AD99517003FC87E /* OwlrangeNotesTests */, + 13B07F861A680F5B00A75B9A /* StudynON */, + 00E356ED1AD99517003FC87E /* StudynONTests */, ); }; /* End PBXProject section */ @@ -289,18 +289,18 @@ files = ( 81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */, 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */, - 28E08914C520493B9E9EB0F1 /* Roboto-Black.ttf in Resources */, - 146B9FC049BF4EAA97567258 /* Roboto-BlackItalic.ttf in Resources */, - 50DF45EED6064E79BB4E22E6 /* Roboto-Bold.ttf in Resources */, - F37349ADDE8F45DABDA48703 /* Roboto-BoldItalic.ttf in Resources */, - D64409009C1045A5B48D83DF /* Roboto-Italic.ttf in Resources */, - 1D3A563DF8334567B861617E /* Roboto-Light.ttf in Resources */, - 296E31DBFD98494CB25AB8E2 /* Roboto-LightItalic.ttf in Resources */, - 8ABD7FA23782420FB354940E /* Roboto-Medium.ttf in Resources */, - 2D5721C65B9942C58FA65D3C /* Roboto-MediumItalic.ttf in Resources */, - 6FB8464FD55849EEA0C3F3B8 /* Roboto-Regular.ttf in Resources */, - D6E82206E7D04118BBB99F25 /* Roboto-Thin.ttf in Resources */, - 8979254EB3104CABA7D4C557 /* Roboto-ThinItalic.ttf in Resources */, + A364C00E2C6647958E849762 /* Roboto-Black.ttf in Resources */, + 7A5456501A184C5C97B7CD5E /* Roboto-BlackItalic.ttf in Resources */, + 63903E8CC1EC437A8D56AC96 /* Roboto-Bold.ttf in Resources */, + 7759005732204525AA85BA49 /* Roboto-BoldItalic.ttf in Resources */, + 5E073E03A0824B11AA6FD017 /* Roboto-Italic.ttf in Resources */, + 8744E5F71B8D40A691E4ABB9 /* Roboto-Light.ttf in Resources */, + 0B13F8F1D0624026873BC7E9 /* Roboto-LightItalic.ttf in Resources */, + 7EABF86BDCF64D70BEDD36AD /* Roboto-Medium.ttf in Resources */, + 1C5E16D1E3694D748ADD7A14 /* Roboto-MediumItalic.ttf in Resources */, + 4DD5EBD111E74DA7941FC317 /* Roboto-Regular.ttf in Resources */, + ED93396516124282ACD2DA06 /* Roboto-Thin.ttf in Resources */, + A137FA57FB1B451199C6C093 /* Roboto-ThinItalic.ttf in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -329,15 +329,15 @@ files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-OwlrangeNotes/Pods-OwlrangeNotes-frameworks-${CONFIGURATION}-input-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-StudynON/Pods-StudynON-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-OwlrangeNotes/Pods-OwlrangeNotes-frameworks-${CONFIGURATION}-output-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-StudynON/Pods-StudynON-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-OwlrangeNotes/Pods-OwlrangeNotes-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-StudynON/Pods-StudynON-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; A55EABD7B0C7F3A422A6CC61 /* [CP] Check Pods Manifest.lock */ = { @@ -355,7 +355,7 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-OwlrangeNotes-OwlrangeNotesTests-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-StudynON-StudynONTests-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -377,7 +377,7 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-OwlrangeNotes-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-StudynON-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -390,15 +390,15 @@ files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-OwlrangeNotes-OwlrangeNotesTests/Pods-OwlrangeNotes-OwlrangeNotesTests-frameworks-${CONFIGURATION}-input-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-StudynON-StudynONTests/Pods-StudynON-StudynONTests-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-OwlrangeNotes-OwlrangeNotesTests/Pods-OwlrangeNotes-OwlrangeNotesTests-frameworks-${CONFIGURATION}-output-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-StudynON-StudynONTests/Pods-StudynON-StudynONTests-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-OwlrangeNotes-OwlrangeNotesTests/Pods-OwlrangeNotes-OwlrangeNotesTests-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-StudynON-StudynONTests/Pods-StudynON-StudynONTests-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; E235C05ADACE081382539298 /* [CP] Copy Pods Resources */ = { @@ -407,15 +407,15 @@ files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-OwlrangeNotes/Pods-OwlrangeNotes-resources-${CONFIGURATION}-input-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-StudynON/Pods-StudynON-resources-${CONFIGURATION}-input-files.xcfilelist", ); name = "[CP] Copy Pods Resources"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-OwlrangeNotes/Pods-OwlrangeNotes-resources-${CONFIGURATION}-output-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-StudynON/Pods-StudynON-resources-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-OwlrangeNotes/Pods-OwlrangeNotes-resources.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-StudynON/Pods-StudynON-resources.sh\"\n"; showEnvVarsInLog = 0; }; F6A41C54EA430FDDC6A6ED99 /* [CP] Copy Pods Resources */ = { @@ -424,15 +424,15 @@ files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-OwlrangeNotes-OwlrangeNotesTests/Pods-OwlrangeNotes-OwlrangeNotesTests-resources-${CONFIGURATION}-input-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-StudynON-StudynONTests/Pods-StudynON-StudynONTests-resources-${CONFIGURATION}-input-files.xcfilelist", ); name = "[CP] Copy Pods Resources"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-OwlrangeNotes-OwlrangeNotesTests/Pods-OwlrangeNotes-OwlrangeNotesTests-resources-${CONFIGURATION}-output-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-StudynON-StudynONTests/Pods-StudynON-StudynONTests-resources-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-OwlrangeNotes-OwlrangeNotesTests/Pods-OwlrangeNotes-OwlrangeNotesTests-resources.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-StudynON-StudynONTests/Pods-StudynON-StudynONTests-resources.sh\"\n"; showEnvVarsInLog = 0; }; FD10A7F022414F080027D42C /* Start Packager */ = { @@ -461,7 +461,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 00E356F31AD99517003FC87E /* OwlrangeNotesTests.m in Sources */, + 00E356F31AD99517003FC87E /* StudynONTests.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -479,7 +479,7 @@ /* Begin PBXTargetDependency section */ 00E356F51AD99517003FC87E /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 13B07F861A680F5B00A75B9A /* OwlrangeNotes */; + target = 13B07F861A680F5B00A75B9A /* StudynON */; targetProxy = 00E356F41AD99517003FC87E /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -487,14 +487,14 @@ /* Begin XCBuildConfiguration section */ 00E356F61AD99517003FC87E /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 5B7EB9410499542E8C5724F5 /* Pods-OwlrangeNotes-OwlrangeNotesTests.debug.xcconfig */; + baseConfigurationReference = 5B7EB9410499542E8C5724F5 /* Pods-StudynON-StudynONTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", "$(inherited)", ); - INFOPLIST_FILE = OwlrangeNotesTests/Info.plist; + INFOPLIST_FILE = StudynONTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.4; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -508,17 +508,17 @@ ); PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/OwlrangeNotes.app/OwlrangeNotes"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/StudynON.app/StudynON"; }; name = Debug; }; 00E356F71AD99517003FC87E /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 89C6BE57DB24E9ADA2F236DE /* Pods-OwlrangeNotes-OwlrangeNotesTests.release.xcconfig */; + baseConfigurationReference = 89C6BE57DB24E9ADA2F236DE /* Pods-StudynON-StudynONTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; COPY_PHASE_STRIP = NO; - INFOPLIST_FILE = OwlrangeNotesTests/Info.plist; + INFOPLIST_FILE = StudynONTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.4; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -532,30 +532,31 @@ ); PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/OwlrangeNotes.app/OwlrangeNotes"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/StudynON.app/StudynON"; }; name = Release; }; 13B07F941A680F5B00A75B9A /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 3B4392A12AC88292D35C810B /* Pods-OwlrangeNotes.debug.xcconfig */; + baseConfigurationReference = 3B4392A12AC88292D35C810B /* Pods-StudynON.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = 1; ENABLE_BITCODE = NO; - INFOPLIST_FILE = OwlrangeNotes/Info.plist; + INFOPLIST_FILE = StudynON/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); + MARKETING_VERSION = 1.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", "-lc++", ); PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)"; - PRODUCT_NAME = OwlrangeNotes; + PRODUCT_NAME = StudynON; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; @@ -564,23 +565,24 @@ }; 13B07F951A680F5B00A75B9A /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 5709B34CF0A7D63546082F79 /* Pods-OwlrangeNotes.release.xcconfig */; + baseConfigurationReference = 5709B34CF0A7D63546082F79 /* Pods-StudynON.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = 1; - INFOPLIST_FILE = OwlrangeNotes/Info.plist; + INFOPLIST_FILE = StudynON/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); + MARKETING_VERSION = 1.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", "-lc++", ); PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)"; - PRODUCT_NAME = OwlrangeNotes; + PRODUCT_NAME = StudynON; SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; }; @@ -619,7 +621,7 @@ COPY_PHASE_STRIP = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; - "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = ""; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -653,7 +655,6 @@ "-DFOLLY_MOBILE=1", "-DFOLLY_USE_LIBCPP=1", ); - REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; }; name = Debug; @@ -691,7 +692,7 @@ COPY_PHASE_STRIP = YES; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = ""; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -717,7 +718,6 @@ "-DFOLLY_MOBILE=1", "-DFOLLY_USE_LIBCPP=1", ); - REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; VALIDATE_PRODUCT = YES; }; @@ -726,7 +726,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "OwlrangeNotesTests" */ = { + 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "StudynONTests" */ = { isa = XCConfigurationList; buildConfigurations = ( 00E356F61AD99517003FC87E /* Debug */, @@ -735,7 +735,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "OwlrangeNotes" */ = { + 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "StudynON" */ = { isa = XCConfigurationList; buildConfigurations = ( 13B07F941A680F5B00A75B9A /* Debug */, @@ -744,7 +744,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "OwlrangeNotes" */ = { + 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "StudynON" */ = { isa = XCConfigurationList; buildConfigurations = ( 83CBBA201A601CBA00E9B192 /* Debug */, diff --git a/ios/OwlrangeNotes.xcodeproj/xcshareddata/xcschemes/OwlrangeNotes.xcscheme b/ios/StudynON.xcodeproj/xcshareddata/xcschemes/StudynON.xcscheme similarity index 79% rename from ios/OwlrangeNotes.xcodeproj/xcshareddata/xcschemes/OwlrangeNotes.xcscheme rename to ios/StudynON.xcodeproj/xcshareddata/xcschemes/StudynON.xcscheme index 8f4f669..c1ce84b 100644 --- a/ios/OwlrangeNotes.xcodeproj/xcshareddata/xcschemes/OwlrangeNotes.xcscheme +++ b/ios/StudynON.xcodeproj/xcshareddata/xcschemes/StudynON.xcscheme @@ -15,9 +15,9 @@ + BuildableName = "StudynON.app" + BlueprintName = "StudynON" + ReferencedContainer = "container:StudynON.xcodeproj"> @@ -33,9 +33,9 @@ + BuildableName = "StudynONTests.xctest" + BlueprintName = "StudynONTests" + ReferencedContainer = "container:StudynON.xcodeproj"> @@ -55,9 +55,9 @@ + BuildableName = "StudynON.app" + BlueprintName = "StudynON" + ReferencedContainer = "container:StudynON.xcodeproj"> @@ -72,9 +72,9 @@ + BuildableName = "StudynON.app" + BlueprintName = "StudynON" + ReferencedContainer = "container:StudynON.xcodeproj"> diff --git a/ios/StudynON/AppDelegate.h b/ios/StudynON/AppDelegate.h new file mode 100644 index 0000000..5d28082 --- /dev/null +++ b/ios/StudynON/AppDelegate.h @@ -0,0 +1,6 @@ +#import +#import + +@interface AppDelegate : RCTAppDelegate + +@end diff --git a/ios/StudynON/AppDelegate.mm b/ios/StudynON/AppDelegate.mm new file mode 100644 index 0000000..e505b4e --- /dev/null +++ b/ios/StudynON/AppDelegate.mm @@ -0,0 +1,36 @@ +#import "AppDelegate.h" + +#import + +@implementation AppDelegate + +- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions +{ + self.moduleName = @"StudynON"; + // You can add your custom initial props in the dictionary below. + // They will be passed down to the ViewController used by React Native. + self.initialProps = @{}; + + return [super application:application didFinishLaunchingWithOptions:launchOptions]; +} + +- (NSURL *)sourceURLForBridge:(RCTBridge *)bridge +{ +#if DEBUG + return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index"]; +#else + return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"]; +#endif +} + +/// This method controls whether the `concurrentRoot`feature of React18 is turned on or off. +/// +/// @see: https://reactjs.org/blog/2022/03/29/react-v18.html +/// @note: This requires to be rendering on Fabric (i.e. on the New Architecture). +/// @return: `true` if the `concurrentRoot` feature is enabled. Otherwise, it returns `false`. +- (BOOL)concurrentRootEnabled +{ + return true; +} + +@end diff --git a/ios/OwlrangeNotes/Images.xcassets/AppIcon.appiconset/Contents.json b/ios/StudynON/Images.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from ios/OwlrangeNotes/Images.xcassets/AppIcon.appiconset/Contents.json rename to ios/StudynON/Images.xcassets/AppIcon.appiconset/Contents.json diff --git a/ios/OwlrangeNotes/Images.xcassets/Contents.json b/ios/StudynON/Images.xcassets/Contents.json similarity index 100% rename from ios/OwlrangeNotes/Images.xcassets/Contents.json rename to ios/StudynON/Images.xcassets/Contents.json diff --git a/ios/OwlrangeNotes/Info.plist b/ios/StudynON/Info.plist similarity index 94% rename from ios/OwlrangeNotes/Info.plist rename to ios/StudynON/Info.plist index f87b6a3..b265b53 100644 --- a/ios/OwlrangeNotes/Info.plist +++ b/ios/StudynON/Info.plist @@ -5,7 +5,7 @@ CFBundleDevelopmentRegion en CFBundleDisplayName - OwlrangeNotes + StudynON CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier @@ -17,11 +17,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.0 + $(MARKETING_VERSION) CFBundleSignature ???? CFBundleVersion - 1 + $(CURRENT_PROJECT_VERSION) LSRequiresIPhoneOS NSAppTransportSecurity diff --git a/ios/OwlrangeNotes/LaunchScreen.storyboard b/ios/StudynON/LaunchScreen.storyboard similarity index 94% rename from ios/OwlrangeNotes/LaunchScreen.storyboard rename to ios/StudynON/LaunchScreen.storyboard index 3d6a6e4..61ff41f 100644 --- a/ios/OwlrangeNotes/LaunchScreen.storyboard +++ b/ios/StudynON/LaunchScreen.storyboard @@ -16,7 +16,7 @@ -