diff --git a/apps/mobile/.detoxrc.js b/apps/mobile/.detoxrc.js new file mode 100644 index 000000000..10bff8800 --- /dev/null +++ b/apps/mobile/.detoxrc.js @@ -0,0 +1,92 @@ +/** @type {Detox.DetoxConfig} */ +module.exports = { + testRunner: { + args: { + $0: "jest", + config: "e2e/jest.config.js" + }, + jest: { + setupTimeout: 120000 + } + }, + apps: { + "ios.debug": { + type: "ios.app", + binaryPath: + "ios/build/Build/Products/Debug-iphonesimulator/Notesnook.app", + build: + "xcodebuild -workspace ios/Notesnook.xcworkspace -scheme YOUR_APP -configuration Debug -sdk iphonesimulator -derivedDataPath ios/build" + }, + "ios.release": { + type: "ios.app", + binaryPath: + "ios/build/Build/Products/Release-iphonesimulator/Notesnook.app", + build: + "xcodebuild -workspace ios/Notesnook.xcworkspace -scheme YOUR_APP -configuration Release -sdk iphonesimulator -derivedDataPath ios/build" + }, + "android.debug": { + type: "android.apk", + binaryPath: "android/app/build/outputs/apk/debug/app-arm64-v8a-debug.apk", + testBinaryPath: + "android/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk", + build: + "cd android ; ENVFILE=.env.test ./gradlew assembleDebug assembleAndroidTest -DtestBuildType=debug && cd ..", + reversePorts: [8081] + }, + "android.release": { + type: "android.apk", + binaryPath: + "android/app/build/outputs/apk/release/app-arm64-v8a-release.apk", + testBinaryPath: + "android/app/build/outputs/apk/androidTest/release/app-release-androidTest.apk", + build: + "cd android ; ENVFILE=.env.test ./gradlew assembleRelease assembleAndroidTest -DtestBuildType=release ; cd .." + } + }, + devices: { + simulator: { + type: "ios.simulator", + device: { + type: "iPhone 12" + } + }, + attached: { + type: "android.attached", + device: { + adbName: ".*" + } + }, + emulator: { + type: "android.emulator", + device: { + avdName: "Pixel_5_API_34" + } + } + }, + configurations: { + "ios.sim.debug": { + device: "simulator", + app: "ios.debug" + }, + "ios.sim.release": { + device: "simulator", + app: "ios.release" + }, + "android.att.debug": { + device: "attached", + app: "android.debug" + }, + "android.att.release": { + device: "attached", + app: "android.release" + }, + "android.emu.debug": { + device: "emulator", + app: "android.debug" + }, + "android.emu.release": { + device: "emulator", + app: "android.release" + } + } +}; diff --git a/apps/mobile/native/.env b/apps/mobile/.env similarity index 100% rename from apps/mobile/native/.env rename to apps/mobile/.env diff --git a/apps/mobile/native/.env.public b/apps/mobile/.env.public similarity index 100% rename from apps/mobile/native/.env.public rename to apps/mobile/.env.public diff --git a/apps/mobile/native/.env.test b/apps/mobile/.env.test similarity index 100% rename from apps/mobile/native/.env.test rename to apps/mobile/.env.test diff --git a/apps/mobile/.gitignore b/apps/mobile/.gitignore index 08c5026d6..e4c0d77e1 100644 --- a/apps/mobile/.gitignore +++ b/apps/mobile/.gitignore @@ -4,7 +4,7 @@ artifacts/ # .DS_Store -native/android/app/src/main/assets/ +android/app/src/main/assets/ *Issues.md build_cache/ # @@ -16,11 +16,12 @@ build_cache/ .cxx/ *.keystore !debug.keystore +.kotlin/ # Xcode # -native/ios/Pods -native/ios/DerivedData +ios/Pods +ios/DerivedData build/ *.pbxuser !default.pbxuser @@ -39,7 +40,7 @@ DerivedData *.xcuserstate *.hprof **/.xcode.env.local -native/cache +cache # Android/IntelliJ # rn-build-deps/ @@ -69,7 +70,7 @@ buck-out/ */fastlane/report.xml */fastlane/Preview.html */fastlane/screenshots -native/vendor +vendor # Bundle artifact *.jsbundle diff --git a/apps/mobile/native/.ruby-version b/apps/mobile/.ruby-version similarity index 100% rename from apps/mobile/native/.ruby-version rename to apps/mobile/.ruby-version diff --git a/apps/mobile/native/Gemfile b/apps/mobile/Gemfile similarity index 74% rename from apps/mobile/native/Gemfile rename to apps/mobile/Gemfile index 03278dd5e..6a4c5f171 100644 --- a/apps/mobile/native/Gemfile +++ b/apps/mobile/Gemfile @@ -8,3 +8,9 @@ gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1' gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0' gem 'xcodeproj', '< 1.26.0' gem 'concurrent-ruby', '< 1.3.4' + +# Ruby 3.4.0 has removed some libraries from the standard library. +gem 'bigdecimal' +gem 'logger' +gem 'benchmark' +gem 'mutex_m' diff --git a/apps/mobile/native/Gemfile.lock b/apps/mobile/Gemfile.lock similarity index 98% rename from apps/mobile/native/Gemfile.lock rename to apps/mobile/Gemfile.lock index c9cba65d9..3e5b901de 100644 --- a/apps/mobile/native/Gemfile.lock +++ b/apps/mobile/Gemfile.lock @@ -109,8 +109,12 @@ PLATFORMS DEPENDENCIES activesupport (>= 6.1.7.5, != 7.1.0) + benchmark + bigdecimal cocoapods (>= 1.13, != 1.15.1, != 1.15.0) concurrent-ruby (< 1.3.4) + logger + mutex_m xcodeproj (< 1.26.0) RUBY VERSION diff --git a/apps/mobile/native/android/.project b/apps/mobile/android/.project similarity index 100% rename from apps/mobile/native/android/.project rename to apps/mobile/android/.project diff --git a/apps/mobile/native/android/.settings/org.eclipse.buildship.core.prefs b/apps/mobile/android/.settings/org.eclipse.buildship.core.prefs similarity index 100% rename from apps/mobile/native/android/.settings/org.eclipse.buildship.core.prefs rename to apps/mobile/android/.settings/org.eclipse.buildship.core.prefs diff --git a/apps/mobile/native/android/app/build.gradle b/apps/mobile/android/app/build.gradle similarity index 92% rename from apps/mobile/native/android/app/build.gradle rename to apps/mobile/android/app/build.gradle index f0291b528..4d19b7bf7 100644 --- a/apps/mobile/native/android/app/build.gradle +++ b/apps/mobile/android/app/build.gradle @@ -11,13 +11,13 @@ import org.apache.tools.ant.taskdefs.condition.Os react { /* Folders */ // The root of your project, i.e. where "package.json" lives. Default is '..' - root = file("$rootDir/../") + //root = file("$rootDir/..") // The folder where the react-native NPM package is. Default is ../node_modules/react-native - reactNativeDir = file("$rootDir/../../node_modules/react-native") + //reactNativeDir = file("$rootDir/../node_modules/react-native") // The folder where the react-native Codegen package is. Default is ../node_modules/react-native-codegen - codegenDir = file("$rootDir/../../node_modules/react-native-codegen") + //codegenDir = file("$rootDir/../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("$rootDir/../../node_modules/react-native/cli.js") + // cliFile = file("$rootDir/../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'. @@ -44,7 +44,7 @@ react { // extraPackagerArgs = [] /* Hermes Commands */ // The hermes compiler command to run. By default it is 'hermesc' - hermesCommand = "$rootDir/../../node_modules/react-native/sdks/hermesc/%OS-BIN%/hermesc" + hermesCommand = "$rootDir/../node_modules/react-native/sdks/hermesc/%OS-BIN%/hermesc" // // The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map" hermesFlags = ["-O", "-output-source-map"] @@ -72,14 +72,14 @@ def enableProguardInReleaseBuilds = true * The preferred build flavor of JavaScriptCore. * * For example, to use the international variant, you can use: - * `def jscFlavor = 'org.webkit:android-jsc-intl:+'` + * `def jscFlavor = io.github.react-native-community:jsc-android-intl:2026004.+` * * 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 * this variant is about 6MiB larger per architecture than default. */ -def jscFlavor = 'org.webkit:android-jsc:+' +def jscFlavor = 'io.github.react-native-community:jsc-android:2026004.+' /** * Architectures to build native code for. @@ -94,7 +94,7 @@ def fdroidBuild() { } def getNpmVersion() { - def inputFile = file("$rootDir/../../package.json") + def inputFile = file("$rootDir/../package.json") def jsonPackage = new JsonSlurper().parseText(inputFile.text) print(jsonPackage["version"]) return jsonPackage["version"] @@ -165,7 +165,7 @@ android { minifyEnabled enableProguardInReleaseBuilds shrinkResources false proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" - proguardFile "${rootProject.projectDir}/../../node_modules/detox/android/detox/proguard-rules-app.pro" + proguardFile "${rootProject.projectDir}/../node_modules/detox/android/detox/proguard-rules-app.pro" buildConfigField "boolean", "FDROID_BUILD", "${fdroidBuild()}" } @@ -232,26 +232,24 @@ dependencies { } -} - - +} task deleteFiles(type: Delete) { delete './src/main/assets/static' } task copyEditorBundle(type: Copy) { - from '../../../../../packages/editor-mobile/build.bundle' + from '../../../../packages/editor-mobile/build.bundle' into './src/main/assets' } task copyPlainEditorBundle(type: Copy) { - from '../../ios/extension.bundle' + from '.../ios/extension.bundle' into './src/main/assets' } task copyFontFiles(type: Copy) { - from '../../fonts' + from '../fonts' into './src/main/assets/fonts' } diff --git a/apps/mobile/native/android/app/proguard-rules.pro b/apps/mobile/android/app/proguard-rules.pro similarity index 100% rename from apps/mobile/native/android/app/proguard-rules.pro rename to apps/mobile/android/app/proguard-rules.pro diff --git a/apps/mobile/native/android/app/src/androidTest/java/com/streetwriters/notesnook/DetoxTest.java b/apps/mobile/android/app/src/androidTest/java/com/streetwriters/notesnook/DetoxTest.java similarity index 100% rename from apps/mobile/native/android/app/src/androidTest/java/com/streetwriters/notesnook/DetoxTest.java rename to apps/mobile/android/app/src/androidTest/java/com/streetwriters/notesnook/DetoxTest.java diff --git a/apps/mobile/native/android/app/src/debug/AndroidManifest.xml b/apps/mobile/android/app/src/debug/AndroidManifest.xml similarity index 100% rename from apps/mobile/native/android/app/src/debug/AndroidManifest.xml rename to apps/mobile/android/app/src/debug/AndroidManifest.xml diff --git a/apps/mobile/native/android/app/src/main/AndroidManifest.xml b/apps/mobile/android/app/src/main/AndroidManifest.xml similarity index 100% rename from apps/mobile/native/android/app/src/main/AndroidManifest.xml rename to apps/mobile/android/app/src/main/AndroidManifest.xml diff --git a/apps/mobile/native/android/app/src/main/ic_launcher-playstore.png b/apps/mobile/android/app/src/main/ic_launcher-playstore.png similarity index 100% rename from apps/mobile/native/android/app/src/main/ic_launcher-playstore.png rename to apps/mobile/android/app/src/main/ic_launcher-playstore.png diff --git a/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/BootRecieverService.java b/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/BootRecieverService.java similarity index 100% rename from apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/BootRecieverService.java rename to apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/BootRecieverService.java diff --git a/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/BootTaskService.java b/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/BootTaskService.java similarity index 100% rename from apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/BootTaskService.java rename to apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/BootTaskService.java diff --git a/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/MainActivity.java b/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/MainActivity.java similarity index 98% rename from apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/MainActivity.java rename to apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/MainActivity.java index ca82cf660..d574144de 100644 --- a/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/MainActivity.java +++ b/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/MainActivity.java @@ -21,7 +21,8 @@ import com.zoontek.rnbootsplash.RNBootSplash; public class MainActivity extends ReactActivity { @Override protected void onCreate(Bundle savedInstanceState) { - RNBootSplash.init(this); + RNBootSplash.init(this, R.style.BootTheme); + super.onCreate(null); if (BuildConfig.DEBUG) { WebView.setWebContentsDebuggingEnabled(true); diff --git a/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/MainApplication.kt b/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/MainApplication.kt similarity index 77% rename from apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/MainApplication.kt rename to apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/MainApplication.kt index 72c31c36f..202326b12 100644 --- a/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/MainApplication.kt +++ b/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/MainApplication.kt @@ -6,11 +6,9 @@ import com.facebook.react.ReactApplication import com.facebook.react.ReactHost import com.facebook.react.ReactNativeHost import com.facebook.react.ReactPackage -import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost import com.facebook.react.defaults.DefaultReactNativeHost -import com.facebook.soloader.SoLoader -import com.facebook.react.soloader.OpenSourceMergedSoMapping +import com.facebook.react.ReactNativeApplicationEntryPoint.loadReactNative class MainApplication : Application(), ReactApplication { @@ -37,10 +35,6 @@ class MainApplication : Application(), ReactApplication { override fun onCreate() { super.onCreate() - SoLoader.init(this, OpenSourceMergedSoMapping) - if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) { - // If you opted-in for the New Architecture, we load the native entry point for this app. - load() - } + loadReactNative(this) } } \ No newline at end of file diff --git a/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/NNativeModulePackage.java b/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/NNativeModulePackage.java similarity index 100% rename from apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/NNativeModulePackage.java rename to apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/NNativeModulePackage.java diff --git a/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/NotePreviewConfigureActivity.java b/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/NotePreviewConfigureActivity.java similarity index 100% rename from apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/NotePreviewConfigureActivity.java rename to apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/NotePreviewConfigureActivity.java diff --git a/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/NotePreviewWidget.java b/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/NotePreviewWidget.java similarity index 100% rename from apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/NotePreviewWidget.java rename to apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/NotePreviewWidget.java diff --git a/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/NoteWidget.java b/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/NoteWidget.java similarity index 100% rename from apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/NoteWidget.java rename to apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/NoteWidget.java diff --git a/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/NotesnookTileService.java b/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/NotesnookTileService.java similarity index 100% rename from apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/NotesnookTileService.java rename to apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/NotesnookTileService.java diff --git a/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/OnClearFromRecentService.java b/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/OnClearFromRecentService.java similarity index 100% rename from apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/OnClearFromRecentService.java rename to apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/OnClearFromRecentService.java diff --git a/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/RCTNNativeModule.java b/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/RCTNNativeModule.java similarity index 100% rename from apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/RCTNNativeModule.java rename to apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/RCTNNativeModule.java diff --git a/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/ReminderViewsService.java b/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/ReminderViewsService.java similarity index 100% rename from apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/ReminderViewsService.java rename to apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/ReminderViewsService.java diff --git a/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/ReminderWidgetProvider.java b/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/ReminderWidgetProvider.java similarity index 100% rename from apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/ReminderWidgetProvider.java rename to apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/ReminderWidgetProvider.java diff --git a/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/ShareActivity.java b/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/ShareActivity.java similarity index 100% rename from apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/ShareActivity.java rename to apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/ShareActivity.java diff --git a/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/ShareApplication.java b/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/ShareApplication.java similarity index 100% rename from apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/ShareApplication.java rename to apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/ShareApplication.java diff --git a/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/datatypes/BaseItem.java b/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/datatypes/BaseItem.java similarity index 100% rename from apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/datatypes/BaseItem.java rename to apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/datatypes/BaseItem.java diff --git a/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/datatypes/Note.java b/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/datatypes/Note.java similarity index 100% rename from apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/datatypes/Note.java rename to apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/datatypes/Note.java diff --git a/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/datatypes/Reminder.java b/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/datatypes/Reminder.java similarity index 100% rename from apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/datatypes/Reminder.java rename to apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/datatypes/Reminder.java diff --git a/apps/mobile/native/android/app/src/main/res/drawable-anydpi/ic_action_name.xml b/apps/mobile/android/app/src/main/res/drawable-anydpi/ic_action_name.xml similarity index 100% rename from apps/mobile/native/android/app/src/main/res/drawable-anydpi/ic_action_name.xml rename to apps/mobile/android/app/src/main/res/drawable-anydpi/ic_action_name.xml diff --git a/apps/mobile/native/android/app/src/main/res/drawable-anydpi/ic_newnote.xml b/apps/mobile/android/app/src/main/res/drawable-anydpi/ic_newnote.xml similarity index 100% rename from apps/mobile/native/android/app/src/main/res/drawable-anydpi/ic_newnote.xml rename to apps/mobile/android/app/src/main/res/drawable-anydpi/ic_newnote.xml diff --git a/apps/mobile/native/android/app/src/main/res/drawable-hdpi/ic_action_name.png b/apps/mobile/android/app/src/main/res/drawable-hdpi/ic_action_name.png similarity index 100% rename from apps/mobile/native/android/app/src/main/res/drawable-hdpi/ic_action_name.png rename to apps/mobile/android/app/src/main/res/drawable-hdpi/ic_action_name.png diff --git a/apps/mobile/native/android/app/src/main/res/drawable-hdpi/ic_newnote.png b/apps/mobile/android/app/src/main/res/drawable-hdpi/ic_newnote.png similarity index 100% rename from apps/mobile/native/android/app/src/main/res/drawable-hdpi/ic_newnote.png rename to apps/mobile/android/app/src/main/res/drawable-hdpi/ic_newnote.png diff --git a/apps/mobile/native/android/app/src/main/res/drawable-hdpi/ic_stat_name.png b/apps/mobile/android/app/src/main/res/drawable-hdpi/ic_stat_name.png similarity index 100% rename from apps/mobile/native/android/app/src/main/res/drawable-hdpi/ic_stat_name.png rename to apps/mobile/android/app/src/main/res/drawable-hdpi/ic_stat_name.png diff --git a/apps/mobile/native/android/app/src/main/res/drawable-mdpi/ic_action_name.png b/apps/mobile/android/app/src/main/res/drawable-mdpi/ic_action_name.png similarity index 100% rename from apps/mobile/native/android/app/src/main/res/drawable-mdpi/ic_action_name.png rename to apps/mobile/android/app/src/main/res/drawable-mdpi/ic_action_name.png diff --git a/apps/mobile/native/android/app/src/main/res/drawable-mdpi/ic_newnote.png b/apps/mobile/android/app/src/main/res/drawable-mdpi/ic_newnote.png similarity index 100% rename from apps/mobile/native/android/app/src/main/res/drawable-mdpi/ic_newnote.png rename to apps/mobile/android/app/src/main/res/drawable-mdpi/ic_newnote.png diff --git a/apps/mobile/native/android/app/src/main/res/drawable-mdpi/ic_stat_name.png b/apps/mobile/android/app/src/main/res/drawable-mdpi/ic_stat_name.png similarity index 100% rename from apps/mobile/native/android/app/src/main/res/drawable-mdpi/ic_stat_name.png rename to apps/mobile/android/app/src/main/res/drawable-mdpi/ic_stat_name.png diff --git a/apps/mobile/native/android/app/src/main/res/drawable-nodpi/example_appwidget_preview.png b/apps/mobile/android/app/src/main/res/drawable-nodpi/example_appwidget_preview.png similarity index 100% rename from apps/mobile/native/android/app/src/main/res/drawable-nodpi/example_appwidget_preview.png rename to apps/mobile/android/app/src/main/res/drawable-nodpi/example_appwidget_preview.png diff --git a/apps/mobile/native/android/app/src/main/res/drawable-xhdpi/ic_action_name.png b/apps/mobile/android/app/src/main/res/drawable-xhdpi/ic_action_name.png similarity index 100% rename from apps/mobile/native/android/app/src/main/res/drawable-xhdpi/ic_action_name.png rename to apps/mobile/android/app/src/main/res/drawable-xhdpi/ic_action_name.png diff --git a/apps/mobile/native/android/app/src/main/res/drawable-xhdpi/ic_newnote.png b/apps/mobile/android/app/src/main/res/drawable-xhdpi/ic_newnote.png similarity index 100% rename from apps/mobile/native/android/app/src/main/res/drawable-xhdpi/ic_newnote.png rename to apps/mobile/android/app/src/main/res/drawable-xhdpi/ic_newnote.png diff --git a/apps/mobile/native/android/app/src/main/res/drawable-xhdpi/ic_stat_name.png b/apps/mobile/android/app/src/main/res/drawable-xhdpi/ic_stat_name.png similarity index 100% rename from apps/mobile/native/android/app/src/main/res/drawable-xhdpi/ic_stat_name.png rename to apps/mobile/android/app/src/main/res/drawable-xhdpi/ic_stat_name.png diff --git a/apps/mobile/native/android/app/src/main/res/drawable-xxhdpi/ic_action_name.png b/apps/mobile/android/app/src/main/res/drawable-xxhdpi/ic_action_name.png similarity index 100% rename from apps/mobile/native/android/app/src/main/res/drawable-xxhdpi/ic_action_name.png rename to apps/mobile/android/app/src/main/res/drawable-xxhdpi/ic_action_name.png diff --git a/apps/mobile/native/android/app/src/main/res/drawable-xxhdpi/ic_newnote.png b/apps/mobile/android/app/src/main/res/drawable-xxhdpi/ic_newnote.png similarity index 100% rename from apps/mobile/native/android/app/src/main/res/drawable-xxhdpi/ic_newnote.png rename to apps/mobile/android/app/src/main/res/drawable-xxhdpi/ic_newnote.png diff --git a/apps/mobile/native/android/app/src/main/res/drawable-xxhdpi/ic_stat_name.png b/apps/mobile/android/app/src/main/res/drawable-xxhdpi/ic_stat_name.png similarity index 100% rename from apps/mobile/native/android/app/src/main/res/drawable-xxhdpi/ic_stat_name.png rename to apps/mobile/android/app/src/main/res/drawable-xxhdpi/ic_stat_name.png diff --git a/apps/mobile/native/android/app/src/main/res/drawable-xxxhdpi/ic_stat_name.png b/apps/mobile/android/app/src/main/res/drawable-xxxhdpi/ic_stat_name.png similarity index 100% rename from apps/mobile/native/android/app/src/main/res/drawable-xxxhdpi/ic_stat_name.png rename to apps/mobile/android/app/src/main/res/drawable-xxxhdpi/ic_stat_name.png diff --git a/apps/mobile/native/android/app/src/main/res/drawable/add_note.xml b/apps/mobile/android/app/src/main/res/drawable/add_note.xml similarity index 100% rename from apps/mobile/native/android/app/src/main/res/drawable/add_note.xml rename to apps/mobile/android/app/src/main/res/drawable/add_note.xml diff --git a/apps/mobile/native/android/app/src/main/res/drawable/edit_text.xml b/apps/mobile/android/app/src/main/res/drawable/edit_text.xml similarity index 100% rename from apps/mobile/native/android/app/src/main/res/drawable/edit_text.xml rename to apps/mobile/android/app/src/main/res/drawable/edit_text.xml diff --git a/apps/mobile/native/android/app/src/main/res/drawable/layout_bg.xml b/apps/mobile/android/app/src/main/res/drawable/layout_bg.xml similarity index 100% rename from apps/mobile/native/android/app/src/main/res/drawable/layout_bg.xml rename to apps/mobile/android/app/src/main/res/drawable/layout_bg.xml diff --git a/apps/mobile/native/android/app/src/main/res/drawable/note_widget_preview.png b/apps/mobile/android/app/src/main/res/drawable/note_widget_preview.png similarity index 100% rename from apps/mobile/native/android/app/src/main/res/drawable/note_widget_preview.png rename to apps/mobile/android/app/src/main/res/drawable/note_widget_preview.png diff --git a/apps/mobile/native/android/app/src/main/res/drawable/notesnooktext.png b/apps/mobile/android/app/src/main/res/drawable/notesnooktext.png similarity index 100% rename from apps/mobile/native/android/app/src/main/res/drawable/notesnooktext.png rename to apps/mobile/android/app/src/main/res/drawable/notesnooktext.png diff --git a/apps/mobile/native/android/app/src/main/res/drawable/reminder_preview.png b/apps/mobile/android/app/src/main/res/drawable/reminder_preview.png similarity index 100% rename from apps/mobile/native/android/app/src/main/res/drawable/reminder_preview.png rename to apps/mobile/android/app/src/main/res/drawable/reminder_preview.png diff --git a/apps/mobile/native/android/app/src/main/res/drawable/widget_preview.png b/apps/mobile/android/app/src/main/res/drawable/widget_preview.png similarity index 100% rename from apps/mobile/native/android/app/src/main/res/drawable/widget_preview.png rename to apps/mobile/android/app/src/main/res/drawable/widget_preview.png diff --git a/apps/mobile/native/android/app/src/main/res/layout/new_note_widget.xml b/apps/mobile/android/app/src/main/res/layout/new_note_widget.xml similarity index 100% rename from apps/mobile/native/android/app/src/main/res/layout/new_note_widget.xml rename to apps/mobile/android/app/src/main/res/layout/new_note_widget.xml diff --git a/apps/mobile/native/android/app/src/main/res/layout/new_note_widget_icon.xml b/apps/mobile/android/app/src/main/res/layout/new_note_widget_icon.xml similarity index 100% rename from apps/mobile/native/android/app/src/main/res/layout/new_note_widget_icon.xml rename to apps/mobile/android/app/src/main/res/layout/new_note_widget_icon.xml diff --git a/apps/mobile/native/android/app/src/main/res/layout/note_widget.xml b/apps/mobile/android/app/src/main/res/layout/note_widget.xml similarity index 100% rename from apps/mobile/native/android/app/src/main/res/layout/note_widget.xml rename to apps/mobile/android/app/src/main/res/layout/note_widget.xml diff --git a/apps/mobile/native/android/app/src/main/res/layout/widget_reminder_empty.xml b/apps/mobile/android/app/src/main/res/layout/widget_reminder_empty.xml similarity index 100% rename from apps/mobile/native/android/app/src/main/res/layout/widget_reminder_empty.xml rename to apps/mobile/android/app/src/main/res/layout/widget_reminder_empty.xml diff --git a/apps/mobile/native/android/app/src/main/res/layout/widget_reminder_layout.xml b/apps/mobile/android/app/src/main/res/layout/widget_reminder_layout.xml similarity index 100% rename from apps/mobile/native/android/app/src/main/res/layout/widget_reminder_layout.xml rename to apps/mobile/android/app/src/main/res/layout/widget_reminder_layout.xml diff --git a/apps/mobile/native/android/app/src/main/res/layout/widget_reminder_layout_small.xml b/apps/mobile/android/app/src/main/res/layout/widget_reminder_layout_small.xml similarity index 100% rename from apps/mobile/native/android/app/src/main/res/layout/widget_reminder_layout_small.xml rename to apps/mobile/android/app/src/main/res/layout/widget_reminder_layout_small.xml diff --git a/apps/mobile/native/android/app/src/main/res/layout/widget_reminders.xml b/apps/mobile/android/app/src/main/res/layout/widget_reminders.xml similarity index 100% rename from apps/mobile/native/android/app/src/main/res/layout/widget_reminders.xml rename to apps/mobile/android/app/src/main/res/layout/widget_reminders.xml diff --git a/apps/mobile/native/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/apps/mobile/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from apps/mobile/native/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to apps/mobile/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/apps/mobile/native/android/app/src/main/res/mipmap-hdpi/bootsplash_logo.png b/apps/mobile/android/app/src/main/res/mipmap-hdpi/bootsplash_logo.png similarity index 100% rename from apps/mobile/native/android/app/src/main/res/mipmap-hdpi/bootsplash_logo.png rename to apps/mobile/android/app/src/main/res/mipmap-hdpi/bootsplash_logo.png diff --git a/apps/mobile/native/android/app/src/main/res/mipmap-hdpi/bootsplash_logo_dark.png b/apps/mobile/android/app/src/main/res/mipmap-hdpi/bootsplash_logo_dark.png similarity index 100% rename from apps/mobile/native/android/app/src/main/res/mipmap-hdpi/bootsplash_logo_dark.png rename to apps/mobile/android/app/src/main/res/mipmap-hdpi/bootsplash_logo_dark.png diff --git a/apps/mobile/native/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png b/apps/mobile/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png similarity index 100% rename from apps/mobile/native/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png rename to apps/mobile/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png diff --git a/apps/mobile/native/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/apps/mobile/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png similarity index 100% rename from apps/mobile/native/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png rename to apps/mobile/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png diff --git a/apps/mobile/native/android/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png b/apps/mobile/android/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png similarity index 100% rename from apps/mobile/native/android/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png rename to apps/mobile/android/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png diff --git a/apps/mobile/native/android/app/src/main/res/mipmap-mdpi/bootsplash_logo.png b/apps/mobile/android/app/src/main/res/mipmap-mdpi/bootsplash_logo.png similarity index 100% rename from apps/mobile/native/android/app/src/main/res/mipmap-mdpi/bootsplash_logo.png rename to apps/mobile/android/app/src/main/res/mipmap-mdpi/bootsplash_logo.png diff --git a/apps/mobile/native/android/app/src/main/res/mipmap-mdpi/bootsplash_logo_dark.png b/apps/mobile/android/app/src/main/res/mipmap-mdpi/bootsplash_logo_dark.png similarity index 100% rename from apps/mobile/native/android/app/src/main/res/mipmap-mdpi/bootsplash_logo_dark.png rename to apps/mobile/android/app/src/main/res/mipmap-mdpi/bootsplash_logo_dark.png diff --git a/apps/mobile/native/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png b/apps/mobile/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png similarity index 100% rename from apps/mobile/native/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png rename to apps/mobile/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png diff --git a/apps/mobile/native/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/apps/mobile/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png similarity index 100% rename from apps/mobile/native/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png rename to apps/mobile/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png diff --git a/apps/mobile/native/android/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png b/apps/mobile/android/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png similarity index 100% rename from apps/mobile/native/android/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png rename to apps/mobile/android/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png diff --git a/apps/mobile/native/android/app/src/main/res/mipmap-xhdpi/bootsplash_logo.png b/apps/mobile/android/app/src/main/res/mipmap-xhdpi/bootsplash_logo.png similarity index 100% rename from apps/mobile/native/android/app/src/main/res/mipmap-xhdpi/bootsplash_logo.png rename to apps/mobile/android/app/src/main/res/mipmap-xhdpi/bootsplash_logo.png diff --git a/apps/mobile/native/android/app/src/main/res/mipmap-xhdpi/bootsplash_logo_dark.png b/apps/mobile/android/app/src/main/res/mipmap-xhdpi/bootsplash_logo_dark.png similarity index 100% rename from apps/mobile/native/android/app/src/main/res/mipmap-xhdpi/bootsplash_logo_dark.png rename to apps/mobile/android/app/src/main/res/mipmap-xhdpi/bootsplash_logo_dark.png diff --git a/apps/mobile/native/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png b/apps/mobile/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png similarity index 100% rename from apps/mobile/native/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png rename to apps/mobile/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png diff --git a/apps/mobile/native/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/apps/mobile/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png similarity index 100% rename from apps/mobile/native/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png rename to apps/mobile/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png diff --git a/apps/mobile/native/android/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png b/apps/mobile/android/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png similarity index 100% rename from apps/mobile/native/android/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png rename to apps/mobile/android/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png diff --git a/apps/mobile/native/android/app/src/main/res/mipmap-xxhdpi/bootsplash_logo.png b/apps/mobile/android/app/src/main/res/mipmap-xxhdpi/bootsplash_logo.png similarity index 100% rename from apps/mobile/native/android/app/src/main/res/mipmap-xxhdpi/bootsplash_logo.png rename to apps/mobile/android/app/src/main/res/mipmap-xxhdpi/bootsplash_logo.png diff --git a/apps/mobile/native/android/app/src/main/res/mipmap-xxhdpi/bootsplash_logo_dark.png b/apps/mobile/android/app/src/main/res/mipmap-xxhdpi/bootsplash_logo_dark.png similarity index 100% rename from apps/mobile/native/android/app/src/main/res/mipmap-xxhdpi/bootsplash_logo_dark.png rename to apps/mobile/android/app/src/main/res/mipmap-xxhdpi/bootsplash_logo_dark.png diff --git a/apps/mobile/native/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png b/apps/mobile/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png similarity index 100% rename from apps/mobile/native/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png rename to apps/mobile/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png diff --git a/apps/mobile/native/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/apps/mobile/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png similarity index 100% rename from apps/mobile/native/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png rename to apps/mobile/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png diff --git a/apps/mobile/native/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png b/apps/mobile/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png similarity index 100% rename from apps/mobile/native/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png rename to apps/mobile/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png diff --git a/apps/mobile/native/android/app/src/main/res/mipmap-xxxhdpi/bootsplash_logo.png b/apps/mobile/android/app/src/main/res/mipmap-xxxhdpi/bootsplash_logo.png similarity index 100% rename from apps/mobile/native/android/app/src/main/res/mipmap-xxxhdpi/bootsplash_logo.png rename to apps/mobile/android/app/src/main/res/mipmap-xxxhdpi/bootsplash_logo.png diff --git a/apps/mobile/native/android/app/src/main/res/mipmap-xxxhdpi/bootsplash_logo_dark.png b/apps/mobile/android/app/src/main/res/mipmap-xxxhdpi/bootsplash_logo_dark.png similarity index 100% rename from apps/mobile/native/android/app/src/main/res/mipmap-xxxhdpi/bootsplash_logo_dark.png rename to apps/mobile/android/app/src/main/res/mipmap-xxxhdpi/bootsplash_logo_dark.png diff --git a/apps/mobile/native/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png b/apps/mobile/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png similarity index 100% rename from apps/mobile/native/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png rename to apps/mobile/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png diff --git a/apps/mobile/native/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/apps/mobile/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png similarity index 100% rename from apps/mobile/native/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png rename to apps/mobile/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png diff --git a/apps/mobile/native/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png b/apps/mobile/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png similarity index 100% rename from apps/mobile/native/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png rename to apps/mobile/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png diff --git a/apps/mobile/native/android/app/src/main/res/values-night/colors.xml b/apps/mobile/android/app/src/main/res/values-night/colors.xml similarity index 100% rename from apps/mobile/native/android/app/src/main/res/values-night/colors.xml rename to apps/mobile/android/app/src/main/res/values-night/colors.xml diff --git a/apps/mobile/native/android/app/src/main/res/values-night/styles.xml b/apps/mobile/android/app/src/main/res/values-night/styles.xml similarity index 100% rename from apps/mobile/native/android/app/src/main/res/values-night/styles.xml rename to apps/mobile/android/app/src/main/res/values-night/styles.xml diff --git a/apps/mobile/native/android/app/src/main/res/values/attrs.xml b/apps/mobile/android/app/src/main/res/values/attrs.xml similarity index 100% rename from apps/mobile/native/android/app/src/main/res/values/attrs.xml rename to apps/mobile/android/app/src/main/res/values/attrs.xml diff --git a/apps/mobile/native/android/app/src/main/res/values/colors.xml b/apps/mobile/android/app/src/main/res/values/colors.xml similarity index 100% rename from apps/mobile/native/android/app/src/main/res/values/colors.xml rename to apps/mobile/android/app/src/main/res/values/colors.xml diff --git a/apps/mobile/native/android/app/src/main/res/values/dimens.xml b/apps/mobile/android/app/src/main/res/values/dimens.xml similarity index 100% rename from apps/mobile/native/android/app/src/main/res/values/dimens.xml rename to apps/mobile/android/app/src/main/res/values/dimens.xml diff --git a/apps/mobile/native/android/app/src/main/res/values/keep.xml b/apps/mobile/android/app/src/main/res/values/keep.xml similarity index 100% rename from apps/mobile/native/android/app/src/main/res/values/keep.xml rename to apps/mobile/android/app/src/main/res/values/keep.xml diff --git a/apps/mobile/native/android/app/src/main/res/values/strings.xml b/apps/mobile/android/app/src/main/res/values/strings.xml similarity index 100% rename from apps/mobile/native/android/app/src/main/res/values/strings.xml rename to apps/mobile/android/app/src/main/res/values/strings.xml diff --git a/apps/mobile/native/android/app/src/main/res/values/styles.xml b/apps/mobile/android/app/src/main/res/values/styles.xml similarity index 96% rename from apps/mobile/native/android/app/src/main/res/values/styles.xml rename to apps/mobile/android/app/src/main/res/values/styles.xml index 493644f5c..c1d2f8951 100644 --- a/apps/mobile/native/android/app/src/main/res/values/styles.xml +++ b/apps/mobile/android/app/src/main/res/values/styles.xml @@ -17,7 +17,7 @@ -