From a2b2f55996891675699fb55088a4eae5c8542ae6 Mon Sep 17 00:00:00 2001 From: Gheorghe Pinzaru Date: Tue, 17 Mar 2020 17:57:23 +0300 Subject: [PATCH] Use react native screens on ios and android Signed-off-by: Gheorghe Pinzaru --- ios/Podfile.lock | 8 +- mobile/js_files/package.json | 2 +- mobile/js_files/yarn.lock | 8 +- .../maven-and-npm-deps/maven/maven-inputs.txt | 25 +- .../maven/maven-sources.nix | 239 +++++++++++++----- src/status_im/android/core.cljs | 2 + src/status_im/ios/core.cljs | 2 + 7 files changed, 211 insertions(+), 75 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index b6226b4c06..2c552ee3a8 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -199,7 +199,7 @@ PODS: - React - react-native-netinfo (4.4.0): - React - - react-native-safe-area-context (0.6.0): + - react-native-safe-area-context (0.7.3): - React - react-native-shake (3.4.0): - React @@ -261,7 +261,7 @@ PODS: - React - RNReanimated (1.7.0): - React - - RNScreens (2.0.0-alpha.25): + - RNScreens (2.3.0): - React - RNSVG (9.11.1): - React @@ -450,7 +450,7 @@ SPEC CHECKSUMS: react-native-image-resizer: 4516052af6ae0248caf4ccf356caecefe60072d7 react-native-mail: 7e37dfbe93ff0d4c7df346b738854dbed533e86f react-native-netinfo: 6bb847e64f45a2d69c6173741111cfd95c669301 - react-native-safe-area-context: d288138da2c800caa111f9352e9333f186a06ead + react-native-safe-area-context: e200d4433aba6b7e60b52da5f37af11f7a0b0392 react-native-shake: de052eaa3eadc4a326b8ddd7ac80c06e8d84528c react-native-splash-screen: 200d11d188e2e78cea3ad319964f6142b6384865 react-native-webview: 0658813bcc4b6c22f3cbb035a2227aa896a8cbc0 @@ -472,7 +472,7 @@ SPEC CHECKSUMS: RNKeychain: 216f37338fcb9e5c3a2530f1e3295f737a690cb1 RNLanguages: 962e562af0d34ab1958d89bcfdb64fafc37c513e RNReanimated: 031fe8d9ea93c2bd689a40f05320ef9d96f74d7f - RNScreens: 031d10e2b648afc9546f16b6a786d2efc6870310 + RNScreens: 03bf608b92ac0acf323f47d8f5b63a8f829340c8 RNSVG: be27aa7c58819f97399388ae53d7fa0572f32c7f RSKImageCropper: a446db0e8444a036b34f3c43db01b2373baa4b2a SQLCipher: f9fcf29b2e59ced7defc2a2bdd0ebe79b40d4990 diff --git a/mobile/js_files/package.json b/mobile/js_files/package.json index 247652bb19..ca3d3b4ff4 100644 --- a/mobile/js_files/package.json +++ b/mobile/js_files/package.json @@ -40,7 +40,7 @@ "react-native-navigation-twopane": "git+https://github.com/status-im/react-native-navigation-twopane.git#v0.0.2-status", "react-native-reanimated": "^1.7.0", "react-native-safe-area-context": "^0.7.3", - "react-native-screens": "^2.0.0-alpha.25", + "react-native-screens": "^2.3.0", "react-native-shake": "^3.3.1", "react-native-splash-screen": "^3.2.0", "react-native-status-keycard": "git+https://github.com/status-im/react-native-status-keycard.git#v2.5.20", diff --git a/mobile/js_files/yarn.lock b/mobile/js_files/yarn.lock index 5aa6db1e9d..7a5bf2afd3 100644 --- a/mobile/js_files/yarn.lock +++ b/mobile/js_files/yarn.lock @@ -4929,10 +4929,10 @@ react-native-safe-area-context@^0.7.3: resolved "https://registry.yarnpkg.com/react-native-safe-area-context/-/react-native-safe-area-context-0.7.3.tgz#ad6bd4abbabe195332c53810e4ce5851eb21aa2a" integrity sha512-9Uqu1vlXPi+2cKW/CW6OnHxA76mWC4kF3wvlqzq4DY8hn37AeiXtLFs2WkxH4yXQRrnJdP6ivc65Lz+MqwRZAA== -react-native-screens@^2.0.0-alpha.25: - version "2.0.0-alpha.25" - resolved "https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-2.0.0-alpha.25.tgz#790d273b41d8dde37aa3e43bc662444aff18cd20" - integrity sha512-IxKOqPxIWwyJhFOvfkxU/NSFzM5PRiyWWL8g0WCPozVU1KNEtJQp7j0sONkTLGQDkGwLbDu0kuGawT1zXMnE5A== +react-native-screens@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-2.3.0.tgz#fd2b0c841f4fdebb2937c0e84acccc62bf9ebb22" + integrity sha512-b+zazYedHPZoDzeKOE4RF/rPpJX8AAITazZCsVFUtw5Qn2QNHvAi0xbzWvQFNgqfvET0TLuu8F2HfBDh1WSqdQ== dependencies: debounce "^1.2.0" diff --git a/nix/mobile/android/maven-and-npm-deps/maven/maven-inputs.txt b/nix/mobile/android/maven-and-npm-deps/maven/maven-inputs.txt index 0b42fdedfd..7c592857c5 100644 --- a/nix/mobile/android/maven-and-npm-deps/maven/maven-inputs.txt +++ b/nix/mobile/android/maven-and-npm-deps/maven/maven-inputs.txt @@ -1,4 +1,4 @@ -https://dl.google.com/dl/android/maven2/androidx/activity/activity/1.0.0/activity-1.0.0 +https://dl.google.com/dl/android/maven2/androidx/activity/activity/1.1.0/activity-1.1.0 https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.0.0/annotation-1.0.0 https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.1.0/annotation-1.1.0 https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat-resources/1.1.0/appcompat-resources-1.1.0 @@ -9,11 +9,13 @@ https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.1.0/appco https://dl.google.com/dl/android/maven2/androidx/arch/core/core-common/2.0.0/core-common-2.0.0 https://dl.google.com/dl/android/maven2/androidx/arch/core/core-common/2.1.0/core-common-2.1.0 https://dl.google.com/dl/android/maven2/androidx/arch/core/core-runtime/2.0.0/core-runtime-2.0.0 +https://dl.google.com/dl/android/maven2/androidx/arch/core/core-runtime/2.1.0/core-runtime-2.1.0 https://dl.google.com/dl/android/maven2/androidx/asynclayoutinflater/asynclayoutinflater/1.0.0/asynclayoutinflater-1.0.0 https://dl.google.com/dl/android/maven2/androidx/cardview/cardview/1.0.0/cardview-1.0.0 https://dl.google.com/dl/android/maven2/androidx/collection/collection/1.0.0/collection-1.0.0 https://dl.google.com/dl/android/maven2/androidx/collection/collection/1.1.0/collection-1.1.0 https://dl.google.com/dl/android/maven2/androidx/coordinatorlayout/coordinatorlayout/1.0.0/coordinatorlayout-1.0.0 +https://dl.google.com/dl/android/maven2/androidx/coordinatorlayout/coordinatorlayout/1.1.0/coordinatorlayout-1.1.0 https://dl.google.com/dl/android/maven2/androidx/core/core/1.0.1/core-1.0.1 https://dl.google.com/dl/android/maven2/androidx/core/core/1.1.0/core-1.1.0 https://dl.google.com/dl/android/maven2/androidx/cursoradapter/cursoradapter/1.0.0/cursoradapter-1.0.0 @@ -28,31 +30,34 @@ https://dl.google.com/dl/android/maven2/androidx/documentfile/documentfile/1.0.0 https://dl.google.com/dl/android/maven2/androidx/drawerlayout/drawerlayout/1.0.0/drawerlayout-1.0.0 https://dl.google.com/dl/android/maven2/androidx/exifinterface/exifinterface/1.0.0/exifinterface-1.0.0 https://dl.google.com/dl/android/maven2/androidx/fragment/fragment/1.0.0/fragment-1.0.0 -https://dl.google.com/dl/android/maven2/androidx/fragment/fragment/1.1.0/fragment-1.1.0 +https://dl.google.com/dl/android/maven2/androidx/fragment/fragment/1.2.1/fragment-1.2.1 https://dl.google.com/dl/android/maven2/androidx/interpolator/interpolator/1.0.0/interpolator-1.0.0 https://dl.google.com/dl/android/maven2/androidx/legacy/legacy-support-core-ui/1.0.0/legacy-support-core-ui-1.0.0 https://dl.google.com/dl/android/maven2/androidx/legacy/legacy-support-core-utils/1.0.0/legacy-support-core-utils-1.0.0 https://dl.google.com/dl/android/maven2/androidx/legacy/legacy-support-v4/1.0.0/legacy-support-v4-1.0.0 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-common/2.0.0/lifecycle-common-2.0.0 -https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-common/2.1.0/lifecycle-common-2.1.0 +https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-common/2.2.0/lifecycle-common-2.2.0 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-livedata-core/2.0.0/lifecycle-livedata-core-2.0.0 +https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-livedata-core/2.2.0/lifecycle-livedata-core-2.2.0 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-livedata/2.0.0/lifecycle-livedata-2.0.0 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-runtime/2.0.0/lifecycle-runtime-2.0.0 -https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-runtime/2.1.0/lifecycle-runtime-2.1.0 +https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-runtime/2.2.0/lifecycle-runtime-2.2.0 +https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmodel-savedstate/2.2.0/lifecycle-viewmodel-savedstate-2.2.0 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmodel/2.0.0/lifecycle-viewmodel-2.0.0 -https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmodel/2.1.0/lifecycle-viewmodel-2.1.0 +https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmodel/2.2.0/lifecycle-viewmodel-2.2.0 https://dl.google.com/dl/android/maven2/androidx/loader/loader/1.0.0/loader-1.0.0 https://dl.google.com/dl/android/maven2/androidx/localbroadcastmanager/localbroadcastmanager/1.0.0/localbroadcastmanager-1.0.0 https://dl.google.com/dl/android/maven2/androidx/media/media/1.0.0/media-1.0.0 https://dl.google.com/dl/android/maven2/androidx/multidex/multidex/2.0.1/multidex-2.0.1 https://dl.google.com/dl/android/maven2/androidx/print/print/1.0.0/print-1.0.0 https://dl.google.com/dl/android/maven2/androidx/recyclerview/recyclerview/1.0.0/recyclerview-1.0.0 +https://dl.google.com/dl/android/maven2/androidx/recyclerview/recyclerview/1.1.0/recyclerview-1.1.0 https://dl.google.com/dl/android/maven2/androidx/savedstate/savedstate/1.0.0/savedstate-1.0.0 https://dl.google.com/dl/android/maven2/androidx/slidingpanelayout/slidingpanelayout/1.0.0/slidingpanelayout-1.0.0 https://dl.google.com/dl/android/maven2/androidx/swiperefreshlayout/swiperefreshlayout/1.0.0/swiperefreshlayout-1.0.0 https://dl.google.com/dl/android/maven2/androidx/swiperefreshlayout/swiperefreshlayout/1.1.0-alpha02/swiperefreshlayout-1.1.0-alpha02 -https://dl.google.com/dl/android/maven2/androidx/transition/transition/1.0.0/transition-1.0.0 https://dl.google.com/dl/android/maven2/androidx/transition/transition/1.1.0/transition-1.1.0 +https://dl.google.com/dl/android/maven2/androidx/transition/transition/1.2.0/transition-1.2.0 https://dl.google.com/dl/android/maven2/androidx/vectordrawable/vectordrawable-animated/1.0.0/vectordrawable-animated-1.0.0 https://dl.google.com/dl/android/maven2/androidx/vectordrawable/vectordrawable-animated/1.1.0/vectordrawable-animated-1.1.0 https://dl.google.com/dl/android/maven2/androidx/vectordrawable/vectordrawable/1.0.1/vectordrawable-1.0.1 @@ -60,6 +65,7 @@ https://dl.google.com/dl/android/maven2/androidx/vectordrawable/vectordrawable/1 https://dl.google.com/dl/android/maven2/androidx/versionedparcelable/versionedparcelable/1.0.0/versionedparcelable-1.0.0 https://dl.google.com/dl/android/maven2/androidx/versionedparcelable/versionedparcelable/1.1.0/versionedparcelable-1.1.0 https://dl.google.com/dl/android/maven2/androidx/viewpager/viewpager/1.0.0/viewpager-1.0.0 +https://dl.google.com/dl/android/maven2/androidx/viewpager2/viewpager2/1.0.0/viewpager2-1.0.0 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.0.1/baseLibrary-3.0.1 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.2.1/baseLibrary-3.2.1 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.3.1/baseLibrary-3.3.1 @@ -183,7 +189,7 @@ https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-tas https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-vision-common/17.0.2/play-services-vision-common-17.0.2 https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-vision-image-label/17.0.2/play-services-vision-image-label-17.0.2 https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-vision/17.0.2/play-services-vision-17.0.2 -https://dl.google.com/dl/android/maven2/com/google/android/material/material/1.0.0/material-1.0.0 +https://dl.google.com/dl/android/maven2/com/google/android/material/material/1.1.0/material-1.1.0 https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-common/16.0.3/firebase-common-16.0.3 https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-iid-interop/16.0.1/firebase-iid-interop-16.0.1 https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-iid/17.0.3/firebase-iid-17.0.3 @@ -773,6 +779,7 @@ https://repo.maven.apache.org/maven2/org/apache/apache/19/apache-19 https://repo.maven.apache.org/maven2/org/apache/apache/2/apache-2 https://repo.maven.apache.org/maven2/org/apache/apache/20/apache-20 https://repo.maven.apache.org/maven2/org/apache/apache/21/apache-21 +https://repo.maven.apache.org/maven2/org/apache/apache/23/apache-23 https://repo.maven.apache.org/maven2/org/apache/apache/3/apache-3 https://repo.maven.apache.org/maven2/org/apache/apache/4/apache-4 https://repo.maven.apache.org/maven2/org/apache/apache/5/apache-5 @@ -992,6 +999,7 @@ https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/30/maven-pare https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/31/maven-parent-31 https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/32/maven-parent-32 https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/33/maven-parent-33 +https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/34/maven-parent-34 https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/4/maven-parent-4 https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/5/maven-parent-5 https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/6/maven-parent-6 @@ -1178,7 +1186,7 @@ https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-javadoc-plug https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-javadoc-plugin/2.9/maven-javadoc-plugin-2.9 https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-javadoc-plugin/3.0.0-M1/maven-javadoc-plugin-3.0.0-M1 https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-javadoc-plugin/3.0.0/maven-javadoc-plugin-3.0.0 -https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-javadoc-plugin/3.1.1/maven-javadoc-plugin-3.1.1 +https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-javadoc-plugin/3.2.0/maven-javadoc-plugin-3.2.0 https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-plugin-parent/2.0.1/maven-plugin-parent-2.0.1 https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-plugins/1/maven-plugins-1 https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-plugins/10/maven-plugins-10 @@ -1201,6 +1209,7 @@ https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-plugins/30/m https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-plugins/31/maven-plugins-31 https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-plugins/32/maven-plugins-32 https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-plugins/33/maven-plugins-33 +https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-plugins/34/maven-plugins-34 https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-plugins/8/maven-plugins-8 https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-pmd-plugin/3.4/maven-pmd-plugin-3.4 https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-pmd-plugin/3.6/maven-pmd-plugin-3.6 diff --git a/nix/mobile/android/maven-and-npm-deps/maven/maven-sources.nix b/nix/mobile/android/maven-and-npm-deps/maven/maven-sources.nix index 7e9f664d0f..623480b848 100644 --- a/nix/mobile/android/maven-and-npm-deps/maven/maven-sources.nix +++ b/nix/mobile/android/maven-and-npm-deps/maven/maven-sources.nix @@ -20,19 +20,19 @@ let }; in { - "https://dl.google.com/dl/android/maven2/androidx/activity/activity/1.0.0/activity-1.0.0" = + "https://dl.google.com/dl/android/maven2/androidx/activity/activity/1.1.0/activity-1.1.0" = { host = repositories.google; path = - "androidx/activity/activity/1.0.0/activity-1.0.0"; + "androidx/activity/activity/1.1.0/activity-1.1.0"; type = "aar"; pom = { - sha1 = "f94af7350c14b899596aefd6c50e381a96d933ba"; - sha256 = "10lv8v4dg1jfvmhznia10wsgqxi0inbs0cdql0nk3732c9sbx917"; + sha1 = "c133421ae3bcd7a3c341124b2821223015f0f617"; + sha256 = "1h6nhaq5s7hymkdphy9wp5rzpgqrcbsi6yngr9vd2ym5qlgh141n"; }; jar = { - sha1 = "ed7a64df6e3fbebf7d3d3dfc30b0f47efcc707f7"; - sha256 = "0gacyh2zf933lcdkl2drim3knhaj9pgl936q2m256bjw8m19ig6i"; + sha1 = "67c7a207d26ea46621e261ca2295ed2e2d311f8f"; + sha256 = "1vv7c06cn6ymzjj3vgwyrva7w0r9igi51qi01iyjy0v8cy8kaasg"; }; }; "https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.0.0/annotation-1.0.0" = @@ -185,6 +185,21 @@ in { sha256 = "13jzyv9kwnqjsh0yb0pgvbbbxd7b64jfwz4wchvv84n7cz3mzrl7"; }; }; + "https://dl.google.com/dl/android/maven2/androidx/arch/core/core-runtime/2.1.0/core-runtime-2.1.0" = + { + host = repositories.google; + path = + "androidx/arch/core/core-runtime/2.1.0/core-runtime-2.1.0"; + type = "aar"; + pom = { + sha1 = "a86136badfffa9d668106a80ff4cda9ee9c1cc1b"; + sha256 = "0pf0b1ljzrnl8w4jqsvw69rw35xnjaryhp81j21s2b6dc00yvi60"; + }; + jar = { + sha1 = "2df0e03029caae7863ccb4825addaadc8ab6780c"; + sha256 = "0ljqfpwcpga5mx1pklvw2550pca6mrdz4bdn27xml9yxsddn2xyx"; + }; + }; "https://dl.google.com/dl/android/maven2/androidx/asynclayoutinflater/asynclayoutinflater/1.0.0/asynclayoutinflater-1.0.0" = { host = repositories.google; @@ -260,6 +275,21 @@ in { sha256 = "0wzb576xav3xwlicdi5a4lfmgxxb0bpb9xrbji6kg4wl92awc275"; }; }; + "https://dl.google.com/dl/android/maven2/androidx/coordinatorlayout/coordinatorlayout/1.1.0/coordinatorlayout-1.1.0" = + { + host = repositories.google; + path = + "androidx/coordinatorlayout/coordinatorlayout/1.1.0/coordinatorlayout-1.1.0"; + type = "aar"; + pom = { + sha1 = "2ccdc41c50a15a5cbf1bf0e40e46a63241b1c4ea"; + sha256 = "1bsw7sk4z87057878n4ax8vyi0m39zcprffl5zxjzzzsvp4m4z56"; + }; + jar = { + sha1 = "8eeb7baf75b9595d017642a460df5af3bb9fa4e1"; + sha256 = "1jz8ql8i4ifrkwpsbzaylld17i79zq3ga2iaqlji1bsnpw5f7aa4"; + }; + }; "https://dl.google.com/dl/android/maven2/androidx/core/core/1.0.1/core-1.0.1" = { host = repositories.google; @@ -470,19 +500,19 @@ in { sha256 = "1y0qnp8644b1qx0ag0kzj8w70c09mnqwz9l9g7kk4np63zbk5pb5"; }; }; - "https://dl.google.com/dl/android/maven2/androidx/fragment/fragment/1.1.0/fragment-1.1.0" = + "https://dl.google.com/dl/android/maven2/androidx/fragment/fragment/1.2.1/fragment-1.2.1" = { host = repositories.google; path = - "androidx/fragment/fragment/1.1.0/fragment-1.1.0"; + "androidx/fragment/fragment/1.2.1/fragment-1.2.1"; type = "aar"; pom = { - sha1 = "753e03826c6efdace71d94ed9d04bf008fa6ad3d"; - sha256 = "0i15nlfh2lbjyzydby2k32h3fa1sqxbki2jzbmag7p82mhkyny7g"; + sha1 = "1b7a728cc3bcb5e59043ec8ff12f17f097e2a856"; + sha256 = "18nni56qh3g2dashkrrdvx5n3qzv0blp3j7lh403jskb9jvi27hn"; }; jar = { - sha1 = "5f9efc7569e651415a0958d6b3e6226ef2825c24"; - sha256 = "15hlv03x61fcs9qcb7m2h8wjh75bpsk6dlpv03l2iwak467qnk51"; + sha1 = "e9f94f3786e02a0c2d66f460a4497e7c918d757d"; + sha256 = "1iiv2x7s68y0wc9jd8n5xnljrvd7zg0yg7dhg5v2374rjf5ccr6k"; }; }; "https://dl.google.com/dl/android/maven2/androidx/interpolator/interpolator/1.0.0/interpolator-1.0.0" = @@ -560,19 +590,19 @@ in { sha256 = "1z7y6nsqdzv08x4dxbgcjfyj0pvhkgwmwpgkl5pymb84i0c7mbbv"; }; }; - "https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-common/2.1.0/lifecycle-common-2.1.0" = + "https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-common/2.2.0/lifecycle-common-2.2.0" = { host = repositories.google; path = - "androidx/lifecycle/lifecycle-common/2.1.0/lifecycle-common-2.1.0"; + "androidx/lifecycle/lifecycle-common/2.2.0/lifecycle-common-2.2.0"; type = "jar"; pom = { - sha1 = "de2b915adafa394edd5eadcab6b5089d08fb71f6"; - sha256 = "0xpjh83m6ikc9rqmhz0sbm9my9bg351qjvmviw6255bs8dh2lb39"; + sha1 = "0d038e279eff9df92cdf3e324314ca06d2de3250"; + sha256 = "1mlb24nz9wdjh1yr3drsvnb80c17hw3pqx4v2synfdvxm6iahc6c"; }; jar = { - sha1 = "c67e7807d9cd6c329b9d0218b2ec4e505dd340b7"; - sha256 = "0hr610gzh7k0hbd4fs3l4hl9bn965hmb3zn2c6rhywxx6gjnpnvn"; + sha1 = "4ef09a745007778eef83b92f8f23987a8ea59496"; + sha256 = "0jvksdcwy0r7bkcym5hlds3vw9ql9ibc5f6qgrfyrrfgyymqv2b3"; }; }; "https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-livedata-core/2.0.0/lifecycle-livedata-core-2.0.0" = @@ -590,6 +620,21 @@ in { sha256 = "1g7pqhg95ggrpmvhah24f0r1gmy9hhdayz7ybc7lqx12gvn39qzx"; }; }; + "https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-livedata-core/2.2.0/lifecycle-livedata-core-2.2.0" = + { + host = repositories.google; + path = + "androidx/lifecycle/lifecycle-livedata-core/2.2.0/lifecycle-livedata-core-2.2.0"; + type = "aar"; + pom = { + sha1 = "962f3b9666f789eebafa7b5cdfd0af8f8aed1ab9"; + sha256 = "0brclcgaa67av09nqrgckj4sx5py4l2hqsrk45fiyzc1wcdn4lda"; + }; + jar = { + sha1 = "4bcd5721a6358c312b86d219ff57d4a4a841fc50"; + sha256 = "057nmgwz91f40wgckfj8j51b4wfsyvdmlmihsg8dga8az4x1yv2m"; + }; + }; "https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-livedata/2.0.0/lifecycle-livedata-2.0.0" = { host = repositories.google; @@ -620,19 +665,34 @@ in { sha256 = "1yrwsjfskismgyq5n1vkqv9gz4m445hz876z1qz6ygqq6vkckbz4"; }; }; - "https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-runtime/2.1.0/lifecycle-runtime-2.1.0" = + "https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-runtime/2.2.0/lifecycle-runtime-2.2.0" = { host = repositories.google; path = - "androidx/lifecycle/lifecycle-runtime/2.1.0/lifecycle-runtime-2.1.0"; + "androidx/lifecycle/lifecycle-runtime/2.2.0/lifecycle-runtime-2.2.0"; type = "aar"; pom = { - sha1 = "87fefa0cd4644709a2afc1f2da09397694bfe8b1"; - sha256 = "1jwzjl6nwxnqpgmwmpx170ms6ybxygdyhsrxnpabqy9dvc1cz3dg"; + sha1 = "283a21b2c7ef1c44075724edd605ccaab55fc293"; + sha256 = "0hglx6j0r9aqi4w5sgzjz38v6c986l4b4a7pf0l1djfizrk405bz"; }; jar = { - sha1 = "24af6c5162c83b5bf073e16608fd87821422fe48"; - sha256 = "0arir2aa3qqc74x24qw8slrgbls22ypxbnc33rjp1s35p6bkh5z5"; + sha1 = "62fab579508713b8bbb6d251b0abff6e538e8f46"; + sha256 = "1g70w60v0z3d70r5858arll0ckqbyba4b5csnsdqqfpkl43nr1ig"; + }; + }; + "https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmodel-savedstate/2.2.0/lifecycle-viewmodel-savedstate-2.2.0" = + { + host = repositories.google; + path = + "androidx/lifecycle/lifecycle-viewmodel-savedstate/2.2.0/lifecycle-viewmodel-savedstate-2.2.0"; + type = "aar"; + pom = { + sha1 = "f296a3abc6e55f6da5323ffee00b084503ac8b97"; + sha256 = "1cbdb54cib8vwbv399pbz66qzh53r27z24bn0rbl48bvai72accz"; + }; + jar = { + sha1 = "50d7a240847eb488a740939a6c19f689ee1a4a04"; + sha256 = "0cvzbvpns389zzybxb20zqrn42lshs94k5wg30pzw81bhbxnds1w"; }; }; "https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmodel/2.0.0/lifecycle-viewmodel-2.0.0" = @@ -650,19 +710,19 @@ in { sha256 = "0qn0pkzk70jh5j7w5rf3hy6xxgs3krz2k26g2jmq1bbb3gm0linn"; }; }; - "https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmodel/2.1.0/lifecycle-viewmodel-2.1.0" = + "https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmodel/2.2.0/lifecycle-viewmodel-2.2.0" = { host = repositories.google; path = - "androidx/lifecycle/lifecycle-viewmodel/2.1.0/lifecycle-viewmodel-2.1.0"; + "androidx/lifecycle/lifecycle-viewmodel/2.2.0/lifecycle-viewmodel-2.2.0"; type = "aar"; pom = { - sha1 = "b95d38b7236e5bb4249d74fdab5044c292158342"; - sha256 = "1d54r4vs36ad9zcixdip1mpr575pqy2lqflp9kkjgqn377ip5ai9"; + sha1 = "5b85f9eedca6f1e45f62c6d3ca150cae66acf366"; + sha256 = "07d1d8vahfxmvzi88rk1qhb7c4z8scwzk293kfyf4izz96maz8xa"; }; jar = { - sha1 = "682d06cc95e0632efdb9cfcc18828840ac941148"; - sha256 = "0gajp14n4s37m9n37vs39hmhp6ax13vsra6d4x9qv0mjq5xgnmds"; + sha1 = "695c5e9ee89ee73d69d0981303f138d7680acc01"; + sha256 = "09yyxdc4231nmlwvfhxvp3q1ic09rnhw82lc990xsjbc9nrglzln"; }; }; "https://dl.google.com/dl/android/maven2/androidx/loader/loader/1.0.0/loader-1.0.0" = @@ -755,6 +815,21 @@ in { sha256 = "0j25mc0jfdgzw541icbvjns63aj29fd4ch1bkp52fh01mjqnz586"; }; }; + "https://dl.google.com/dl/android/maven2/androidx/recyclerview/recyclerview/1.1.0/recyclerview-1.1.0" = + { + host = repositories.google; + path = + "androidx/recyclerview/recyclerview/1.1.0/recyclerview-1.1.0"; + type = "aar"; + pom = { + sha1 = "a058fa06eb843f4ef55d18eea26c0afb7b39213e"; + sha256 = "1vvjv72dgmb8jxr05544wni891scaqvi36mkqawniqg4lri10cpy"; + }; + jar = { + sha1 = "8b4f97752ddcbc712af46d208aebd46585cde63b"; + sha256 = "0kvsvqlfqh8w9qfmmlfx4lwmdww1d9ijpvvk3hdyx48agnkbblph"; + }; + }; "https://dl.google.com/dl/android/maven2/androidx/savedstate/savedstate/1.0.0/savedstate-1.0.0" = { host = repositories.google; @@ -815,21 +890,6 @@ in { sha256 = "1rh1zdnh1ipb867bsclrrn4z9lx062h98a9q7wzs523yx9ih7y00"; }; }; - "https://dl.google.com/dl/android/maven2/androidx/transition/transition/1.0.0/transition-1.0.0" = - { - host = repositories.google; - path = - "androidx/transition/transition/1.0.0/transition-1.0.0"; - type = "aar"; - pom = { - sha1 = "cba38d22419c84dcf737d666ae0c980f1e521e65"; - sha256 = "12v826hkvgrm3hzf3x5il92x50gan60gz7x47cq2ykn97ag8ljz7"; - }; - jar = { - sha1 = "f3556ce8f251984acb24014c3ba055ff235929ff"; - sha256 = "1380yk8978c19d0rl6hi3f0caac9fg5sy3lvvbnbq6j07xv0y2m0"; - }; - }; "https://dl.google.com/dl/android/maven2/androidx/transition/transition/1.1.0/transition-1.1.0" = { host = repositories.google; @@ -845,6 +905,21 @@ in { sha256 = "0y7kx238yghsrh06ywgw9xm9zaw0izjcgkmxjngnalc78by4r3mx"; }; }; + "https://dl.google.com/dl/android/maven2/androidx/transition/transition/1.2.0/transition-1.2.0" = + { + host = repositories.google; + path = + "androidx/transition/transition/1.2.0/transition-1.2.0"; + type = "aar"; + pom = { + sha1 = "1ceda042cf551bdede6fdb82adeda0cb6a9b63d2"; + sha256 = "1q8dsakkw11db264dc37zv3nq09wr0qzsicl0rmp1gfag9si4zr4"; + }; + jar = { + sha1 = "28003577e8b32f5417bfe899bbdc7a333dc81c9f"; + sha256 = "0zhmagl4cv35ysn5psjjlnyd50lwm35cvzhfxj6sahqbpjrmkq51"; + }; + }; "https://dl.google.com/dl/android/maven2/androidx/vectordrawable/vectordrawable-animated/1.0.0/vectordrawable-animated-1.0.0" = { host = repositories.google; @@ -950,6 +1025,21 @@ in { sha256 = "10l6zjw2i16iw2l05vfzf0fkrw41swcmwphmiw6h310r9bhz8yhl"; }; }; + "https://dl.google.com/dl/android/maven2/androidx/viewpager2/viewpager2/1.0.0/viewpager2-1.0.0" = + { + host = repositories.google; + path = + "androidx/viewpager2/viewpager2/1.0.0/viewpager2-1.0.0"; + type = "aar"; + pom = { + sha1 = "6c206c3aa4ba7917be9ccf200e11aa83caf01c50"; + sha256 = "0ym113vcfcn446nd72jr901dl0hfw5xgjs21iz4nbzllzskvqqs0"; + }; + jar = { + sha1 = "91c378a09ddff66e1bb73e90edeac53487d2832b"; + sha256 = "1bvm08rj02f9lzz5mf3rki6ybknjb1z2iilnh7a7q96cshqh0p79"; + }; + }; "https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.0.1/baseLibrary-3.0.1" = { host = repositories.google; @@ -2813,19 +2903,19 @@ in { sha256 = "01xqv2zdy2if0fm28l2kfj86dyj1adq977nvhy8v0kzscvxgv0d0"; }; }; - "https://dl.google.com/dl/android/maven2/com/google/android/material/material/1.0.0/material-1.0.0" = + "https://dl.google.com/dl/android/maven2/com/google/android/material/material/1.1.0/material-1.1.0" = { host = repositories.google; path = - "com/google/android/material/material/1.0.0/material-1.0.0"; + "com/google/android/material/material/1.1.0/material-1.1.0"; type = "aar"; pom = { - sha1 = "2bcf783c3bc66bafc0e1c9ca721d7544659bb6c3"; - sha256 = "1aqm6mh1448hszv9agcq85wckpyiwjzhpi85wdfij48wsm0zbzy9"; + sha1 = "eb7940c81a54b428e3c84e2c4c77dddda287cc01"; + sha256 = "1cbva0a8nbv1y8cv6bsyrhjr87mb2f6f3w3nyn7izvlz9rk04kfj"; }; jar = { - sha1 = "f83e012c22d2fac8fcf23880d7167832b099fa94"; - sha256 = "1p0sq4kgxybslqj8044fh056m9fqmp543r5jk7crhdy0lf0y703n"; + sha1 = "0d61ed3259ed48bb0db311d73ab9f358554987b2"; + sha256 = "09kvm7nxk4n1mccgwa831q37kkw3vzlqbsiklw0qxv46b5pgpx2q"; }; }; "https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-common/16.0.3/firebase-common-16.0.3" = @@ -10326,7 +10416,7 @@ in { "javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final"; type = "jar"; pom = { - sha1 = ""; + sha1 = "0d2ad4d1498d1048abc6c6948fd3f835d8fdafb0"; sha256 = "0772mrm8nw31xj6jg5hwgvy2hsbygn1y61mx615w3rnbwq8ljqxq"; }; jar = { @@ -11227,6 +11317,17 @@ in { sha256 = "105k6wsi9n95lfbsz8jz4qc1qfjs9cmjpdf7zb51fkq1v84c245g"; }; }; + "https://repo.maven.apache.org/maven2/org/apache/apache/23/apache-23" = + { + host = repositories.apache; + path = + "org/apache/apache/23/apache-23"; + type = "jar"; + pom = { + sha1 = "0404949e96725e63a10a6d8f9d9b521948d170d5"; + sha256 = "07298c2jfkdb6gaxidig2pnl0ckdjfi9qqy5z9vnbwr30r76445w"; + }; + }; "https://repo.maven.apache.org/maven2/org/apache/apache/3/apache-3" = { host = repositories.apache; @@ -14124,6 +14225,17 @@ in { sha256 = "1skkkp99xacfapx6nr8mbw17qv5z9rh5497y29gjsl39s7yf6miq"; }; }; + "https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/34/maven-parent-34" = + { + host = repositories.apache; + path = + "org/apache/maven/maven-parent/34/maven-parent-34"; + type = "jar"; + pom = { + sha1 = "d03d96b2f4ee06300faa9731b0fa71feeec5a8ef"; + sha256 = "0zr3bbsc5ixqndpj19kmpsfxgh0mw579and94v5qm11bd9xaz3qs"; + }; + }; "https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/4/maven-parent-4" = { host = repositories.apache; @@ -16842,19 +16954,19 @@ in { sha256 = "09ppgy8lcnkmll1rkr7gspa5jy1fixq318g4iqr9f4d14dvnvja8"; }; }; - "https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-javadoc-plugin/3.1.1/maven-javadoc-plugin-3.1.1" = + "https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-javadoc-plugin/3.2.0/maven-javadoc-plugin-3.2.0" = { host = repositories.apache; path = - "org/apache/maven/plugins/maven-javadoc-plugin/3.1.1/maven-javadoc-plugin-3.1.1"; + "org/apache/maven/plugins/maven-javadoc-plugin/3.2.0/maven-javadoc-plugin-3.2.0"; type = "jar"; pom = { - sha1 = "8d529975584b18508bbc5be5f0b9568172e7ad8e"; - sha256 = "1q0qi5hmgch77j9bcivp2nyw99fazyrhpl9gqngimn1d9nqnmkan"; + sha1 = "eceb31c2a75359cfc189d3b2d1d62438ec2a5f73"; + sha256 = "1xvla9pf18rwgkqzgimb8mjibcq5rzxjvnjh3zmr1dbypjdkj4dz"; }; jar = { - sha1 = "9dec756e963b6f8f372b6b6e2f2924696a323df4"; - sha256 = "15acb1kai89rad259817lr9p8zi6yqm8hkydmbn9rqrfkrpcw6v3"; + sha1 = "f65507461614485b907c3c71a2730cfe65041c46"; + sha256 = "10ff0abwzn7877war2r2avd5zl95ig1xglmrm4f25rnfih6rr1z2"; }; }; "https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-plugin-parent/2.0.1/maven-plugin-parent-2.0.1" = @@ -17099,6 +17211,17 @@ in { sha256 = "1lmir1pdcsxnw9wpfb2rmnc2nwdv0wj79xw2id1gl4lp6xpjrc2x"; }; }; + "https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-plugins/34/maven-plugins-34" = + { + host = repositories.apache; + path = + "org/apache/maven/plugins/maven-plugins/34/maven-plugins-34"; + type = "jar"; + pom = { + sha1 = "039027f0abac25deccfc21486550731fa5f55858"; + sha256 = "0h844a6blyqfx1g9bvav09slvpf1ncsmkwhp7xly85wd649iiqc3"; + }; + }; "https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-plugins/8/maven-plugins-8" = { host = repositories.apache; diff --git a/src/status_im/android/core.cljs b/src/status_im/android/core.cljs index 0fe93d5ece..af0c0a839d 100644 --- a/src/status_im/android/core.cljs +++ b/src/status_im/android/core.cljs @@ -9,6 +9,7 @@ [status-im.ui.components.react :as react] [status-im.native-module.core :as status] [status-im.core :as core] + [oops.core :refer [ocall]] [status-im.react-native.js-dependencies :as rn-dependencies] [status-im.utils.snoopy :as snoopy] [status-im.i18n :as i18n] @@ -56,5 +57,6 @@ (defn init [] (status/set-soft-input-mode status/adjust-resize) + (ocall rn-dependencies/react-native-screens "enableScreens") (core/init app-root) (snoopy/subscribe!)) diff --git a/src/status_im/ios/core.cljs b/src/status_im/ios/core.cljs index 8d35bb020a..f818729d1a 100644 --- a/src/status_im/ios/core.cljs +++ b/src/status_im/ios/core.cljs @@ -6,6 +6,7 @@ status-im.ui.screens.events status-im.subs [status-im.react-native.js-dependencies :as rn-dependencies] + [oops.core :refer [ocall]] [status-im.ui.screens.views :as views] [status-im.ui.components.react :as react] [status-im.core :as core] @@ -52,5 +53,6 @@ :reagent-render views/main}))) (defn init [] + (ocall rn-dependencies/react-native-screens "enableScreens") (core/init app-root) (snoopy/subscribe!))