diff --git a/android/app/build.gradle b/android/app/build.gradle
index d40e2787..1937454e 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -4,27 +4,6 @@ apply plugin: "com.facebook.react"
def projectRoot = rootDir.getAbsoluteFile().getParentFile().getAbsolutePath()
-static def versionToNumber(major, minor, patch) {
- return patch * 100 + minor * 10000 + major * 1000000
-}
-
-def getRNVersion() {
- def version = providers.exec {
- workingDir(projectDir)
- commandLine("node", "-e", "console.log(require('react-native/package.json').version);")
- }.standardOutput.asText.get().trim()
-
- def coreVersion = version.split("-")[0]
- def (major, minor, patch) = coreVersion.tokenize('.').collect { it.toInteger() }
-
- return versionToNumber(
- major,
- minor,
- patch
- )
-}
-def rnVersion = getRNVersion()
-
/**
* 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.
@@ -41,12 +20,12 @@ react {
bundleCommand = "export:embed"
/* 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 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")
/* Variants */
// The list of variants to that are debuggable. For those we're going to
@@ -79,10 +58,8 @@ react {
// The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
// hermesFlags = ["-O", "-output-source-map"]
- if (rnVersion >= versionToNumber(0, 75, 0)) {
- /* Autolinking */
- autolinkLibrariesWithApp()
- }
+ /* Autolinking */
+ autolinkLibrariesWithApp()
}
/**
@@ -114,8 +91,8 @@ android {
applicationId 'app.neuland'
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
- versionCode 195
- versionName "0.10.2"
+ versionCode 218
+ versionName "0.11.0"
}
signingConfigs {
debug {
@@ -144,6 +121,9 @@ android {
useLegacyPackaging (findProperty('expo.useLegacyPackaging')?.toBoolean() ?: false)
}
}
+ androidResources {
+ ignoreAssetsPattern '!.svn:!.git:!.ds_store:!*.scc:!CVS:!thumbs.db:!picasa.ini:!*~'
+ }
}
// Apply static values from `gradle.properties` to the `android.packagingOptions`
@@ -194,8 +174,3 @@ dependencies {
implementation jscFlavor
}
}
-
-if (rnVersion < versionToNumber(0, 75, 0)) {
- apply from: new File(["node", "--print", "require.resolve('@react-native-community/cli-platform-android/package.json', { paths: [require.resolve('react-native/package.json')] })"].execute(null, rootDir).text.trim(), "../native_modules.gradle");
- applyNativeModulesAppBuildGradle(project)
-}
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index bf82c0a2..eb75277c 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -16,11 +16,11 @@
-
+
-
+
@@ -34,6 +34,5 @@
-
\ No newline at end of file
diff --git a/android/app/src/main/ic_launcher-playstore.png b/android/app/src/main/ic_launcher-playstore.png
deleted file mode 100644
index b8dfe191..00000000
Binary files a/android/app/src/main/ic_launcher-playstore.png and /dev/null differ
diff --git a/android/app/src/main/java/app/neuland/MainActivity.kt b/android/app/src/main/java/app/neuland/MainActivity.kt
index 22bc8766..e19b453d 100644
--- a/android/app/src/main/java/app/neuland/MainActivity.kt
+++ b/android/app/src/main/java/app/neuland/MainActivity.kt
@@ -1,4 +1,5 @@
package app.neuland
+import expo.modules.splashscreen.SplashScreenManager
import android.os.Build
import android.os.Bundle
@@ -15,7 +16,10 @@ class MainActivity : ReactActivity() {
// Set the theme to AppTheme BEFORE onCreate to support
// coloring the background, status bar, and navigation bar.
// This is required for expo-splash-screen.
- setTheme(R.style.AppTheme);
+ // setTheme(R.style.AppTheme);
+ // @generated begin expo-splashscreen - expo prebuild (DO NOT MODIFY) sync-f3ff59a738c56c9a6119210cb55f0b613eb8b6af
+ SplashScreenManager.registerOnActivity(this)
+ // @generated end expo-splashscreen
super.onCreate(null)
}
diff --git a/android/app/src/main/java/app/neuland/MainApplication.kt b/android/app/src/main/java/app/neuland/MainApplication.kt
index a905c998..b5c1e855 100644
--- a/android/app/src/main/java/app/neuland/MainApplication.kt
+++ b/android/app/src/main/java/app/neuland/MainApplication.kt
@@ -10,6 +10,7 @@ import com.facebook.react.ReactPackage
import com.facebook.react.ReactHost
import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
import com.facebook.react.defaults.DefaultReactNativeHost
+import com.facebook.react.soloader.OpenSourceMergedSoMapping
import com.facebook.soloader.SoLoader
import expo.modules.ApplicationLifecycleDispatcher
@@ -21,9 +22,10 @@ class MainApplication : Application(), ReactApplication {
this,
object : DefaultReactNativeHost(this) {
override fun getPackages(): List {
+ val packages = PackageList(this).packages
// Packages that cannot be autolinked yet can be added manually here, for example:
// packages.add(new MyReactNativePackage());
- return PackageList(this).packages
+ return packages
}
override fun getJSMainModuleName(): String = ".expo/.virtual-metro-entry"
@@ -40,7 +42,7 @@ class MainApplication : Application(), ReactApplication {
override fun onCreate() {
super.onCreate()
- SoLoader.init(this, false)
+ 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()
diff --git a/android/app/src/main/res/drawable-hdpi/splashscreen_image.png b/android/app/src/main/res/drawable-hdpi/splashscreen_image.png
deleted file mode 100644
index 29815e62..00000000
Binary files a/android/app/src/main/res/drawable-hdpi/splashscreen_image.png and /dev/null differ
diff --git a/android/app/src/main/res/drawable-hdpi/splashscreen_logo.png b/android/app/src/main/res/drawable-hdpi/splashscreen_logo.png
new file mode 100644
index 00000000..ef3092d5
Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/splashscreen_logo.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/splashscreen_image.png b/android/app/src/main/res/drawable-mdpi/splashscreen_image.png
deleted file mode 100644
index 29815e62..00000000
Binary files a/android/app/src/main/res/drawable-mdpi/splashscreen_image.png and /dev/null differ
diff --git a/android/app/src/main/res/drawable-mdpi/splashscreen_logo.png b/android/app/src/main/res/drawable-mdpi/splashscreen_logo.png
new file mode 100644
index 00000000..66376da9
Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/splashscreen_logo.png differ
diff --git a/android/app/src/main/res/drawable-night-hdpi/splashscreen_image.png b/android/app/src/main/res/drawable-night-hdpi/splashscreen_image.png
deleted file mode 100644
index 58aee83c..00000000
Binary files a/android/app/src/main/res/drawable-night-hdpi/splashscreen_image.png and /dev/null differ
diff --git a/android/app/src/main/res/drawable-night-hdpi/splashscreen_logo.png b/android/app/src/main/res/drawable-night-hdpi/splashscreen_logo.png
new file mode 100644
index 00000000..6e505194
Binary files /dev/null and b/android/app/src/main/res/drawable-night-hdpi/splashscreen_logo.png differ
diff --git a/android/app/src/main/res/drawable-night-mdpi/splashscreen_image.png b/android/app/src/main/res/drawable-night-mdpi/splashscreen_image.png
deleted file mode 100644
index 58aee83c..00000000
Binary files a/android/app/src/main/res/drawable-night-mdpi/splashscreen_image.png and /dev/null differ
diff --git a/android/app/src/main/res/drawable-night-mdpi/splashscreen_logo.png b/android/app/src/main/res/drawable-night-mdpi/splashscreen_logo.png
new file mode 100644
index 00000000..a01ce770
Binary files /dev/null and b/android/app/src/main/res/drawable-night-mdpi/splashscreen_logo.png differ
diff --git a/android/app/src/main/res/drawable-night-xhdpi/splashscreen_image.png b/android/app/src/main/res/drawable-night-xhdpi/splashscreen_image.png
deleted file mode 100644
index 58aee83c..00000000
Binary files a/android/app/src/main/res/drawable-night-xhdpi/splashscreen_image.png and /dev/null differ
diff --git a/android/app/src/main/res/drawable-night-xhdpi/splashscreen_logo.png b/android/app/src/main/res/drawable-night-xhdpi/splashscreen_logo.png
new file mode 100644
index 00000000..59447eed
Binary files /dev/null and b/android/app/src/main/res/drawable-night-xhdpi/splashscreen_logo.png differ
diff --git a/android/app/src/main/res/drawable-night-xxhdpi/splashscreen_image.png b/android/app/src/main/res/drawable-night-xxhdpi/splashscreen_image.png
deleted file mode 100644
index 58aee83c..00000000
Binary files a/android/app/src/main/res/drawable-night-xxhdpi/splashscreen_image.png and /dev/null differ
diff --git a/android/app/src/main/res/drawable-night-xxhdpi/splashscreen_logo.png b/android/app/src/main/res/drawable-night-xxhdpi/splashscreen_logo.png
new file mode 100644
index 00000000..7b570710
Binary files /dev/null and b/android/app/src/main/res/drawable-night-xxhdpi/splashscreen_logo.png differ
diff --git a/android/app/src/main/res/drawable-night-xxxhdpi/splashscreen_image.png b/android/app/src/main/res/drawable-night-xxxhdpi/splashscreen_image.png
deleted file mode 100644
index 58aee83c..00000000
Binary files a/android/app/src/main/res/drawable-night-xxxhdpi/splashscreen_image.png and /dev/null differ
diff --git a/android/app/src/main/res/drawable-night-xxxhdpi/splashscreen_logo.png b/android/app/src/main/res/drawable-night-xxxhdpi/splashscreen_logo.png
new file mode 100644
index 00000000..4c270319
Binary files /dev/null and b/android/app/src/main/res/drawable-night-xxxhdpi/splashscreen_logo.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/splashscreen_image.png b/android/app/src/main/res/drawable-xhdpi/splashscreen_image.png
deleted file mode 100644
index 29815e62..00000000
Binary files a/android/app/src/main/res/drawable-xhdpi/splashscreen_image.png and /dev/null differ
diff --git a/android/app/src/main/res/drawable-xhdpi/splashscreen_logo.png b/android/app/src/main/res/drawable-xhdpi/splashscreen_logo.png
new file mode 100644
index 00000000..6aeee499
Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/splashscreen_logo.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/splashscreen_image.png b/android/app/src/main/res/drawable-xxhdpi/splashscreen_image.png
deleted file mode 100644
index 29815e62..00000000
Binary files a/android/app/src/main/res/drawable-xxhdpi/splashscreen_image.png and /dev/null differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/splashscreen_logo.png b/android/app/src/main/res/drawable-xxhdpi/splashscreen_logo.png
new file mode 100644
index 00000000..9b50ab32
Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/splashscreen_logo.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/splashscreen_image.png b/android/app/src/main/res/drawable-xxxhdpi/splashscreen_image.png
deleted file mode 100644
index 29815e62..00000000
Binary files a/android/app/src/main/res/drawable-xxxhdpi/splashscreen_image.png and /dev/null differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/splashscreen_logo.png b/android/app/src/main/res/drawable-xxxhdpi/splashscreen_logo.png
new file mode 100644
index 00000000..07ff8f11
Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/splashscreen_logo.png differ
diff --git a/android/app/src/main/res/drawable/splashscreen.xml b/android/app/src/main/res/drawable/ic_launcher_background.xml
similarity index 59%
rename from android/app/src/main/res/drawable/splashscreen.xml
rename to android/app/src/main/res/drawable/ic_launcher_background.xml
index c8568e16..883b2a08 100644
--- a/android/app/src/main/res/drawable/splashscreen.xml
+++ b/android/app/src/main/res/drawable/ic_launcher_background.xml
@@ -1,3 +1,6 @@
+ -
+
+
\ No newline at end of file
diff --git a/android/app/src/main/res/drawable/rn_edit_text_material.xml b/android/app/src/main/res/drawable/rn_edit_text_material.xml
index 73b37e4d..5c25e728 100644
--- a/android/app/src/main/res/drawable/rn_edit_text_material.xml
+++ b/android/app/src/main/res/drawable/rn_edit_text_material.xml
@@ -17,7 +17,8 @@
android:insetLeft="@dimen/abc_edit_text_inset_horizontal_material"
android:insetRight="@dimen/abc_edit_text_inset_horizontal_material"
android:insetTop="@dimen/abc_edit_text_inset_top_material"
- android:insetBottom="@dimen/abc_edit_text_inset_bottom_material">
+ android:insetBottom="@dimen/abc_edit_text_inset_bottom_material"
+ >