From c6fdd3033a034c26f8b5eafbbc905aaa3eacb64d Mon Sep 17 00:00:00 2001 From: Gheorghe Pinzaru Date: Thu, 30 Jan 2020 10:07:25 +0300 Subject: [PATCH] WIP --- android/app/src/main/AndroidManifest.xml | 2 +- .../src/status_im/ui/components/react.cljs | 2 + nix/lein/lein-project-deps-maven-inputs.txt | 22 +- nix/lein/lein-project-deps.nix | 312 +------- .../maven-and-npm-deps/maven/maven-inputs.txt | 49 +- .../maven/maven-sources.nix | 683 ++++++++---------- project.clj | 4 + src/status_im/android/core.cljs | 6 +- src/status_im/cljs_react_navigation/base.cljs | 14 - .../cljs_react_navigation/reagent.cljs | 4 - src/status_im/hardwallet/core.cljs | 2 + src/status_im/multiaccounts/login/core.cljs | 1 + src/status_im/subs.cljs | 9 +- src/status_im/ui/components/tabbar/core.cljs | 225 +++--- .../ui/components/tabbar/styles.cljs | 84 +-- src/status_im/ui/components/topbar.cljs | 2 +- src/status_im/ui/screens/db.cljs | 12 - src/status_im/ui/screens/navigation.cljs | 56 +- src/status_im/ui/screens/pairing/views.cljs | 3 +- .../ui/screens/profile/user/views.cljs | 23 +- src/status_im/ui/screens/progress/styles.cljs | 3 +- src/status_im/ui/screens/progress/views.cljs | 8 +- src/status_im/ui/screens/routing/core.cljs | 147 ++-- .../ui/screens/routing/intro_login_stack.cljs | 65 +- src/status_im/ui/screens/routing/screens.cljs | 23 +- src/status_im/ui/screens/views.cljs | 24 +- .../screens/wallet/transactions/styles.cljs | 4 +- src/status_im/utils/logging/core.cljs | 1 - 28 files changed, 546 insertions(+), 1244 deletions(-) diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index ff89606f455..881d44f6fce 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -38,7 +38,7 @@ android:name=".MainActivity" android:label="@string/app_name" android:screenOrientation="portrait" - android:windowSoftInputMode="adjustResize" + android:windowSoftInputMode="adjustPan" android:configChanges="keyboard|keyboardHidden|orientation|screenSize" android:resizeableActivity="false" android:launchMode="singleTask"> diff --git a/components/src/status_im/ui/components/react.cljs b/components/src/status_im/ui/components/react.cljs index f359698b73f..0c2bbc9b4e1 100644 --- a/components/src/status_im/ui/components/react.cljs +++ b/components/src/status_im/ui/components/react.cljs @@ -272,6 +272,8 @@ (def safe-area-provider (adapt-class (object/get js-dependencies/safe-area-context "SafeAreaProvider"))) +(def safe-area-consumer (adapt-class (object/get js-dependencies/safe-area-context "SafeAreaConsumer"))) + ;; NOTE: Due to a known bug in android: https://github.com/th3rdwave/react-native-safe-area-context/issues/29 ;; do not use safe area in android (def safe-area-view diff --git a/nix/lein/lein-project-deps-maven-inputs.txt b/nix/lein/lein-project-deps-maven-inputs.txt index e7b9436cac1..ab10c763861 100644 --- a/nix/lein/lein-project-deps-maven-inputs.txt +++ b/nix/lein/lein-project-deps-maven-inputs.txt @@ -1,6 +1,6 @@ https://repo.clojars.org/binaryage/devtools/0.9.10/devtools-0.9.10 https://repo.clojars.org/binaryage/env-config/0.2.2/env-config-0.2.2 -https://repo.clojars.org/cider/cider-nrepl/0.14.0/cider-nrepl-0.14.0 +https://repo.clojars.org/binaryage/oops/0.7.0/oops-0.7.0 https://repo.clojars.org/clj-stacktrace/clj-stacktrace/0.2.5/clj-stacktrace-0.2.5 https://repo.clojars.org/clj-time/clj-time/0.11.0/clj-time-0.11.0 https://repo.clojars.org/clj-time/clj-time/0.6.0/clj-time-0.6.0 @@ -22,7 +22,6 @@ https://repo.clojars.org/cljsjs/react/15.5.4-0/react-15.5.4-0 https://repo.clojars.org/clout/clout/2.1.2/clout-2.1.2 https://repo.clojars.org/com/andrewmcveigh/cljs-time/0.4.0/cljs-time-0.4.0 https://repo.clojars.org/com/andrewmcveigh/cljs-time/0.5.2/cljs-time-0.5.2 -https://repo.clojars.org/com/jakemccrary/lein-test-refresh/0.20.0/lein-test-refresh-0.20.0 https://repo.clojars.org/com/taoensso/encore/2.79.1/encore-2.79.1 https://repo.clojars.org/com/taoensso/encore/2.84.2/encore-2.84.2 https://repo.clojars.org/com/taoensso/encore/2.91.0/encore-2.91.0 @@ -43,32 +42,22 @@ https://repo.clojars.org/http-kit/http-kit/2.2.0/http-kit-2.2.0 https://repo.clojars.org/instaparse/instaparse/1.4.0/instaparse-1.4.0 https://repo.clojars.org/io/aviso/pretty/0.1.30/pretty-0.1.30 https://repo.clojars.org/io/aviso/pretty/0.1.33/pretty-0.1.33 -https://repo.clojars.org/jakemcc/clojure-gntp/0.1.1/clojure-gntp-0.1.1 -https://repo.clojars.org/jonase/eastwood/0.2.5/eastwood-0.2.5 -https://repo.clojars.org/jonase/kibit/0.1.5/kibit-0.1.5 https://repo.clojars.org/lein-cljfmt/lein-cljfmt/0.5.7/lein-cljfmt-0.5.7 https://repo.clojars.org/lein-cljsbuild/lein-cljsbuild/1.1.7/lein-cljsbuild-1.1.7 -https://repo.clojars.org/lein-kibit/lein-kibit/0.1.5/lein-kibit-0.1.5 https://repo.clojars.org/lein-re-frisk/lein-re-frisk/0.5.8/lein-re-frisk-0.5.8 -https://repo.clojars.org/leinjacker/leinjacker/0.4.2/leinjacker-0.4.2 https://repo.clojars.org/medley/medley/0.8.2/medley-0.8.2 https://repo.clojars.org/meta-merge/meta-merge/1.0.0/meta-merge-1.0.0 https://repo.clojars.org/mvxcvi/alphabase/1.0.0/alphabase-1.0.0 https://repo.clojars.org/net/cgrand/macrovich/0.2.0/macrovich-0.2.0 -https://repo.clojars.org/org/clojars/brenton/google-diff-match-patch/0.1/google-diff-match-patch-0.1 https://repo.clojars.org/quoin/quoin/0.1.2/quoin-0.1.2 -https://repo.clojars.org/rasom/cljs-react-navigation/0.1.4/cljs-react-navigation-0.1.4 https://repo.clojars.org/rasom/lein-githooks/0.1.5/lein-githooks-0.1.5 https://repo.clojars.org/re-com/re-com/2.1.0/re-com-2.1.0 https://repo.clojars.org/re-frame/re-frame/0.10.1/re-frame-0.10.1 -https://repo.clojars.org/re-frame/re-frame/0.10.4/re-frame-0.10.4 https://repo.clojars.org/re-frisk-shell/re-frisk-shell/0.5.2/re-frisk-shell-0.5.2 https://repo.clojars.org/re-frisk-sidecar/re-frisk-sidecar/0.5.7/re-frisk-sidecar-0.5.7 https://repo.clojars.org/re-frisk/re-frisk/0.5.4/re-frisk-0.5.4 https://repo.clojars.org/reagent/reagent/0.6.0/reagent-0.6.0 https://repo.clojars.org/reagent/reagent/0.7.0/reagent-0.7.0 -https://repo.clojars.org/refactor-nrepl/refactor-nrepl/2.3.0-SNAPSHOT/refactor-nrepl-2.3.0-20170531.195417-17 -https://repo.clojars.org/rewrite-clj/rewrite-clj/0.4.12/rewrite-clj-0.4.12 https://repo.clojars.org/rewrite-clj/rewrite-clj/0.5.2/rewrite-clj-0.5.2 https://repo.clojars.org/rewrite-clj/rewrite-clj/0.6.0/rewrite-clj-0.6.0 https://repo.clojars.org/rewrite-cljs/rewrite-cljs/0.4.3/rewrite-cljs-0.4.3 @@ -198,7 +187,6 @@ https://repo1.maven.org/maven2/org/apache/commons/commons-parent/35/commons-pare https://repo1.maven.org/maven2/org/apache/commons/commons-parent/39/commons-parent-39 https://repo1.maven.org/maven2/org/checkerframework/checker-qual/2.0.0/checker-qual-2.0.0 https://repo1.maven.org/maven2/org/clojure/clojure/1.10.0/clojure-1.10.0 -https://repo1.maven.org/maven2/org/clojure/clojure/1.2.0/clojure-1.2.0 https://repo1.maven.org/maven2/org/clojure/clojure/1.2.1/clojure-1.2.1 https://repo1.maven.org/maven2/org/clojure/clojure/1.3.0/clojure-1.3.0 https://repo1.maven.org/maven2/org/clojure/clojure/1.4.0/clojure-1.4.0 @@ -224,12 +212,9 @@ https://repo1.maven.org/maven2/org/clojure/clojurescript/1.9.946/clojurescript-1 https://repo1.maven.org/maven2/org/clojure/core.async/0.2.395/core.async-0.2.395 https://repo1.maven.org/maven2/org/clojure/core.async/0.4.474/core.async-0.4.474 https://repo1.maven.org/maven2/org/clojure/core.cache/0.6.5/core.cache-0.6.5 -https://repo1.maven.org/maven2/org/clojure/core.contracts/0.0.1/core.contracts-0.0.1 -https://repo1.maven.org/maven2/org/clojure/core.logic/0.8.11/core.logic-0.8.11 https://repo1.maven.org/maven2/org/clojure/core.memoize/0.5.9/core.memoize-0.5.9 https://repo1.maven.org/maven2/org/clojure/core.specs.alpha/0.1.24/core.specs.alpha-0.1.24 https://repo1.maven.org/maven2/org/clojure/core.specs.alpha/0.2.44/core.specs.alpha-0.2.44 -https://repo1.maven.org/maven2/org/clojure/core.unify/0.5.3/core.unify-0.5.3 https://repo1.maven.org/maven2/org/clojure/data.json/0.2.6/data.json-0.2.6 https://repo1.maven.org/maven2/org/clojure/data.priority-map/0.0.7/data.priority-map-0.0.7 https://repo1.maven.org/maven2/org/clojure/google-closure-library-third-party/0.0-20140718-946a7d39/google-closure-library-third-party-0.0-20140718-946a7d39 @@ -244,7 +229,6 @@ https://repo1.maven.org/maven2/org/clojure/google-closure-library/0.0-20160609-f https://repo1.maven.org/maven2/org/clojure/google-closure-library/0.0-20170519-fa0499ef/google-closure-library-0.0-20170519-fa0499ef https://repo1.maven.org/maven2/org/clojure/google-closure-library/0.0-20170809-b9c14c6b/google-closure-library-0.0-20170809-b9c14c6b https://repo1.maven.org/maven2/org/clojure/google-closure-library/0.0-20190213-2033d5d9/google-closure-library-0.0-20190213-2033d5d9 -https://repo1.maven.org/maven2/org/clojure/pom.contrib/0.0.26/pom.contrib-0.0.26 https://repo1.maven.org/maven2/org/clojure/pom.contrib/0.1.2/pom.contrib-0.1.2 https://repo1.maven.org/maven2/org/clojure/pom.contrib/0.2.0/pom.contrib-0.2.0 https://repo1.maven.org/maven2/org/clojure/pom.contrib/0.2.2/pom.contrib-0.2.2 @@ -253,14 +237,11 @@ https://repo1.maven.org/maven2/org/clojure/spec.alpha/0.2.176/spec.alpha-0.2.176 https://repo1.maven.org/maven2/org/clojure/tools.analyzer.jvm/0.6.10/tools.analyzer.jvm-0.6.10 https://repo1.maven.org/maven2/org/clojure/tools.analyzer.jvm/0.7.0/tools.analyzer.jvm-0.7.0 https://repo1.maven.org/maven2/org/clojure/tools.analyzer/0.6.9/tools.analyzer-0.6.9 -https://repo1.maven.org/maven2/org/clojure/tools.cli/0.3.5/tools.cli-0.3.5 https://repo1.maven.org/maven2/org/clojure/tools.logging/0.3.1/tools.logging-0.3.1 https://repo1.maven.org/maven2/org/clojure/tools.macro/0.1.5/tools.macro-0.1.5 https://repo1.maven.org/maven2/org/clojure/tools.namespace/0.2.11/tools.namespace-0.2.11 -https://repo1.maven.org/maven2/org/clojure/tools.nrepl/0.2.12/tools.nrepl-0.2.12 https://repo1.maven.org/maven2/org/clojure/tools.reader/0.10.0/tools.reader-0.10.0 https://repo1.maven.org/maven2/org/clojure/tools.reader/0.8.1/tools.reader-0.8.1 -https://repo1.maven.org/maven2/org/clojure/tools.reader/0.8.13/tools.reader-0.8.13 https://repo1.maven.org/maven2/org/clojure/tools.reader/0.9.1/tools.reader-0.9.1 https://repo1.maven.org/maven2/org/clojure/tools.reader/1.0.0-alpha1/tools.reader-1.0.0-alpha1 https://repo1.maven.org/maven2/org/clojure/tools.reader/1.0.0-alpha3/tools.reader-1.0.0-alpha3 @@ -293,4 +274,3 @@ https://repo1.maven.org/maven2/org/sonatype/oss/oss-parent/4/oss-parent-4 https://repo1.maven.org/maven2/org/sonatype/oss/oss-parent/5/oss-parent-5 https://repo1.maven.org/maven2/org/sonatype/oss/oss-parent/7/oss-parent-7 https://repo1.maven.org/maven2/org/sonatype/oss/oss-parent/9/oss-parent-9 -https://repo1.maven.org/maven2/org/tcrawley/dynapath/0.2.4/dynapath-0.2.4 diff --git a/nix/lein/lein-project-deps.nix b/nix/lein/lein-project-deps.nix index 705e2188969..de054ddc6f4 100644 --- a/nix/lein/lein-project-deps.nix +++ b/nix/lein/lein-project-deps.nix @@ -46,7 +46,7 @@ in { sha256 = "046pab6gz1bh6w1jfbabgxvkrnvncrj93lnmaya5qs6a1z7mccn2"; }; jar = { - sha1 = ""; + sha1 = "bd87a75374a6d6523de82fef51fc3cfe9baf9fc9"; sha256 = "1mlyqrqyhijwkjx4sv2zfn2ciqfwpc08qq8w55rcxb941fxfmpci"; }; }; @@ -68,7 +68,7 @@ in { "args4j/args4j-site/2.33/args4j-site-2.33"; type = "jar"; pom = { - sha1 = ""; + sha1 = "09ba12fde00306694af3ce9f5ff302c858345edf"; sha256 = "1vqqdkrnrbkgxad1sw4qwxqw6rvv86r93ndwakggdg1y5v869ggj"; }; }; @@ -1490,21 +1490,6 @@ in { sha256 = "0f5fpgm2858jq5waq5ww1vvv44b5agi4vmnbhbgnwmy0b150j52h"; }; }; - "https://repo1.maven.org/maven2/org/clojure/clojure/1.2.0/clojure-1.2.0" = - { - host = repositories.maven; - path = - "org/clojure/clojure/1.2.0/clojure-1.2.0"; - type = "jar"; - pom = { - sha1 = "2a2865c4c65da60d47c1e928b83d3959c2b51063"; - sha256 = "0bzsjx5npnb703jniqypk4sp72jviwcirl30v8ya9qggy4asi2br"; - }; - jar = { - sha1 = "2b63087f3d0e3076db16d7ede71018d9ea694b89"; - sha256 = "1fpypifgxxsgbq9bgs5a5xpd4xbgpyfiy9qlgy5g0693rlnlcsp5"; - }; - }; "https://repo1.maven.org/maven2/org/clojure/clojure/1.2.1/clojure-1.2.1" = { host = repositories.maven; @@ -1880,36 +1865,6 @@ in { sha256 = "0i4bkwpqd7r6hcq5j5y6pjw8jbkym50zvnnrvl924gc20fjg06ll"; }; }; - "https://repo1.maven.org/maven2/org/clojure/core.contracts/0.0.1/core.contracts-0.0.1" = - { - host = repositories.maven; - path = - "org/clojure/core.contracts/0.0.1/core.contracts-0.0.1"; - type = "jar"; - pom = { - sha1 = "75ee46d493107fa1862bcc1afa5d5d6ca39d2e55"; - sha256 = "06yd5g3yfgyf378rk713lgyn14grah85bdgggx460iykkq1iyk5s"; - }; - jar = { - sha1 = "45f21ca230364bc6397df5562cc06556fafc8570"; - sha256 = "0px57ji22y8d5ns6x0wigq1wshrp19fqgqdiv8pkb4da6ah2fxaq"; - }; - }; - "https://repo1.maven.org/maven2/org/clojure/core.logic/0.8.11/core.logic-0.8.11" = - { - host = repositories.maven; - path = - "org/clojure/core.logic/0.8.11/core.logic-0.8.11"; - type = "jar"; - pom = { - sha1 = "7d369d237792adee4c6b2d9593cc5a83480960ac"; - sha256 = "1zkp1vq415g10plihw9vahdslwpfdy4k614fdhwj1cql4inyk7wq"; - }; - jar = { - sha1 = "a9f071d4ff559b4d545ff02ef7924bb0223715e5"; - sha256 = "0vlk9056ipgb8vkxn50np3vrqmsngnrh5299k2r8rql4i9miyxjn"; - }; - }; "https://repo1.maven.org/maven2/org/clojure/core.memoize/0.5.9/core.memoize-0.5.9" = { host = repositories.maven; @@ -1955,21 +1910,6 @@ in { sha256 = "071q9dvp9nn3fkqs9yc27kgnmddkps1r0w22d3vipr78y3bc87iv"; }; }; - "https://repo1.maven.org/maven2/org/clojure/core.unify/0.5.3/core.unify-0.5.3" = - { - host = repositories.maven; - path = - "org/clojure/core.unify/0.5.3/core.unify-0.5.3"; - type = "jar"; - pom = { - sha1 = "c81ec453d4ec445e38996b8d4c78aa15fe55878d"; - sha256 = "1c663gqbhqb6yicq10nvna5569nxk7ag7lbxvwszjrgw0c80p63i"; - }; - jar = { - sha1 = "c5ae81d1e38e16ed3af0f9ef0c1579ecb554c19a"; - sha256 = "1yymjrlw81zhkfrdcllgg15xwx3xb6w1ajsg3ygqbjc3hi1x2y8b"; - }; - }; "https://repo1.maven.org/maven2/org/clojure/data.json/0.2.6/data.json-0.2.6" = { host = repositories.maven; @@ -2180,17 +2120,6 @@ in { sha256 = "1sg09m1siylp159w0z4p9wmxb8bqvkvymcr3yff1fk705knhhjnw"; }; }; - "https://repo1.maven.org/maven2/org/clojure/pom.contrib/0.0.26/pom.contrib-0.0.26" = - { - host = repositories.maven; - path = - "org/clojure/pom.contrib/0.0.26/pom.contrib-0.0.26"; - type = "jar"; - pom = { - sha1 = "88a932945abc6130cfbd036a7cc2248b6583deef"; - sha256 = "0id94ff08xs60frqask9zwmb8rd00zdrp16nm97dlnvh2drk3w96"; - }; - }; "https://repo1.maven.org/maven2/org/clojure/pom.contrib/0.1.2/pom.contrib-0.1.2" = { host = repositories.maven; @@ -2299,21 +2228,6 @@ in { sha256 = "1s935mgzxfvaxyj4phf4lzqdp0b5bkiarxnb6ip1rk8anrdcapyd"; }; }; - "https://repo1.maven.org/maven2/org/clojure/tools.cli/0.3.5/tools.cli-0.3.5" = - { - host = repositories.maven; - path = - "org/clojure/tools.cli/0.3.5/tools.cli-0.3.5"; - type = "jar"; - pom = { - sha1 = "efb9155390c012d0a3d0eddf4d7482077095b187"; - sha256 = "0i8f881ycgf9y2a5m5abrzz3l21dc9mymkvxm2yfjxgk8zsiffxc"; - }; - jar = { - sha1 = "aa7953dd72c894c38207ee9a31912d8d57cfc12c"; - sha256 = "0nckff6gycsjv8ppl87aj8n7f9ng2pd3wrwh1gxj0fnvnax2icyq"; - }; - }; "https://repo1.maven.org/maven2/org/clojure/tools.logging/0.3.1/tools.logging-0.3.1" = { host = repositories.maven; @@ -2359,21 +2273,6 @@ in { sha256 = "1bmdv2p581mw436s69zdyz0pdwn4czh7s59dfyqgbv8l0vkhnpqc"; }; }; - "https://repo1.maven.org/maven2/org/clojure/tools.nrepl/0.2.12/tools.nrepl-0.2.12" = - { - host = repositories.maven; - path = - "org/clojure/tools.nrepl/0.2.12/tools.nrepl-0.2.12"; - type = "jar"; - pom = { - sha1 = "63e562097d3944a10293a32c44dafdc3d5fe94fd"; - sha256 = "13lpmf9fsjaxcv9s63pn71qswha5wb9a4qlpd9zzhwf5s6d7xnin"; - }; - jar = { - sha1 = "72b4be694c5a9b253e4cd10d512ae60bb80a5450"; - sha256 = "0s9bfxf0w0cv09284w8l1dqcxyiqvl7p0kr9xmv8q6h3fmxs2gg2"; - }; - }; "https://repo1.maven.org/maven2/org/clojure/tools.reader/0.10.0/tools.reader-0.10.0" = { host = repositories.maven; @@ -2389,21 +2288,6 @@ in { sha256 = "04m8lcfkkcqbqn8bpjsg0p188jf56v9r73jxqg2csrzg6warmnip"; }; }; - "https://repo1.maven.org/maven2/org/clojure/tools.reader/0.8.13/tools.reader-0.8.13" = - { - host = repositories.maven; - path = - "org/clojure/tools.reader/0.8.13/tools.reader-0.8.13"; - type = "jar"; - pom = { - sha1 = "bfb42f18cccb656534fe52fa06b66edf974afd37"; - sha256 = "19dby1jfk14lqj8v1vw0yd84ph0kfbif2q7d03bmwhx9s5h44b2m"; - }; - jar = { - sha1 = "7fabe12e3b42f0b3d4348893c727e39aea060f8c"; - sha256 = "1j1dqa6hkxiq7whm8q0901sn0malxjkaj9ip95b4g3d5s0lxz5kc"; - }; - }; "https://repo1.maven.org/maven2/org/clojure/tools.reader/0.8.1/tools.reader-0.8.1" = { host = repositories.maven; @@ -2851,21 +2735,6 @@ in { sha256 = "0yl2hbwz2kn1hll1i00ddzn8f89bfdcjwdifz0pj2j15k1gjch7v"; }; }; - "https://repo1.maven.org/maven2/org/tcrawley/dynapath/0.2.4/dynapath-0.2.4" = - { - host = repositories.maven; - path = - "org/tcrawley/dynapath/0.2.4/dynapath-0.2.4"; - type = "jar"; - pom = { - sha1 = "00e807cf5db381de190c8c34d8b7b77365c4ee04"; - sha256 = "1kg06sbi6fryp5pxzlwpbvzga7zcav6hjs7zlnkacik2bjxdkpbi"; - }; - jar = { - sha1 = "0b6b994030d5850679270c5acd9586c5c3c43d61"; - sha256 = "05jf8li9sffwfnzb2nwmi7d8qbznjaaxm71fsc486xlhlyrq8rz4"; - }; - }; "https://repo.clojars.org/binaryage/devtools/0.9.10/devtools-0.9.10" = { host = repositories.clojars; @@ -2896,19 +2765,19 @@ in { sha256 = "11j1bls84d8hn8gviawvxkbbnb0hcg1lvw6qqcjj356ap6xzxfic"; }; }; - "https://repo.clojars.org/cider/cider-nrepl/0.14.0/cider-nrepl-0.14.0" = + "https://repo.clojars.org/binaryage/oops/0.7.0/oops-0.7.0" = { host = repositories.clojars; path = - "cider/cider-nrepl/0.14.0/cider-nrepl-0.14.0"; + "binaryage/oops/0.7.0/oops-0.7.0"; type = "jar"; pom = { - sha1 = "07fe77647b577162071f245dfe402df2d7de3631"; - sha256 = "0jc1cmrigbadb4hb1isjvwyj4sd8q4f29xh73w0pjf0vyi4qxjxr"; + sha1 = "de223223c4272ce9ee75c81f8764e894029630b4"; + sha256 = "0sz21344v8lxd6mjlrb8r8yyz934h4lnkwqlpg3csgsi11mppya3"; }; jar = { - sha1 = "35f4dd9e5bcebbe11db020849384574cee9a9ccd"; - sha256 = "0x8rc4wrm11fhham5833f89a428xmahxbgivglgxf45nlyx63sbq"; + sha1 = "9729401b4c6551f6becf44cf0818d04255410099"; + sha256 = "0jkdybj37q3a4vvay3asj47ms7l3qjpidhkk30293w0zc7jk18k8"; }; }; "https://repo.clojars.org/cljfmt/cljfmt/0.5.7/cljfmt-0.5.7" = @@ -3226,21 +3095,6 @@ in { sha256 = "061cjh2a6qpkib5v5mdrsbwhvcbqvh1igvp3b7jhcfj05pgplm1x"; }; }; - "https://repo.clojars.org/com/jakemccrary/lein-test-refresh/0.20.0/lein-test-refresh-0.20.0" = - { - host = repositories.clojars; - path = - "com/jakemccrary/lein-test-refresh/0.20.0/lein-test-refresh-0.20.0"; - type = "jar"; - pom = { - sha1 = "f5f234803e956bfef81139f9c230027533f220c1"; - sha256 = "00z6r0wi80rba0a5r405w623j8kf1k03v7mzc1nmyn6j2yfa0zpa"; - }; - jar = { - sha1 = "9b47ad16cd867ca529b6cd1f2837513bee4cfd99"; - sha256 = "0ffhj9v09qqi5p6y92vglx9i3hjhj0yqxwl3aya027mf7za26zvg"; - }; - }; "https://repo.clojars.org/compojure/compojure/1.5.2/compojure-1.5.2" = { host = repositories.clojars; @@ -3541,51 +3395,6 @@ in { sha256 = "06w7hpgccr7qy47cwzpq5h2fw27am1imc9cbpg3bc5bbydz9q4df"; }; }; - "https://repo.clojars.org/jakemcc/clojure-gntp/0.1.1/clojure-gntp-0.1.1" = - { - host = repositories.clojars; - path = - "jakemcc/clojure-gntp/0.1.1/clojure-gntp-0.1.1"; - type = "jar"; - pom = { - sha1 = "77e86d814e814d926679a284c981653afc890d10"; - sha256 = "18k5bi3insz9y683wf68pgz3rby28jn6mzhhx7rrvx312a2d6ys9"; - }; - jar = { - sha1 = "d0776665f3824f148b7acc6c0c52617b8ec509a1"; - sha256 = "021mz7ywhwjv084q6zzq5kbf8aq1vca4d97b1w0c07w1l6kdakj0"; - }; - }; - "https://repo.clojars.org/jonase/eastwood/0.2.5/eastwood-0.2.5" = - { - host = repositories.clojars; - path = - "jonase/eastwood/0.2.5/eastwood-0.2.5"; - type = "jar"; - pom = { - sha1 = "12cf8c6575ea146502407a4077022118636ea2e3"; - sha256 = "0fl7vk71f0sxqa3z98d6rrbfcc4dyy8s7jrjqx1i4c6jqylagjf4"; - }; - jar = { - sha1 = "b2215f692569e279ca6205d347cac2f4d69e337e"; - sha256 = "1wa3zmhkx01hc4k9spfh9ydpcskp454hmzax7mwrsj8m99ad8r6w"; - }; - }; - "https://repo.clojars.org/jonase/kibit/0.1.5/kibit-0.1.5" = - { - host = repositories.clojars; - path = - "jonase/kibit/0.1.5/kibit-0.1.5"; - type = "jar"; - pom = { - sha1 = "fb6771db6dade7612edb7df503713fdf78f0acdb"; - sha256 = "0p8h3gz8ifqjy073xs0b2cfzqg0hrl79w04fblx4jjwcry4vwjb4"; - }; - jar = { - sha1 = "86896963bfdda06f864f8aa7fe337b759d641ee3"; - sha256 = "03r24clgnyll3kjq44g93cnv7z17324lmp4jg4dlyb0s8zvllnvc"; - }; - }; "https://repo.clojars.org/lein-cljfmt/lein-cljfmt/0.5.7/lein-cljfmt-0.5.7" = { host = repositories.clojars; @@ -3616,36 +3425,6 @@ in { sha256 = "0ihj2dd3lpz3banpqm0pgcj8sd5wywkjy7mxyjyckgb6g48ahf3l"; }; }; - "https://repo.clojars.org/leinjacker/leinjacker/0.4.2/leinjacker-0.4.2" = - { - host = repositories.clojars; - path = - "leinjacker/leinjacker/0.4.2/leinjacker-0.4.2"; - type = "jar"; - pom = { - sha1 = "20bde46f2d390aba1ab1fb121ff4edde79c4eff4"; - sha256 = "1bqk8i3a9d0p3hfqn7fa601iaahfgafh9s973in1727kgccgj9dv"; - }; - jar = { - sha1 = "3fc0e0fb4c35d3d4dc5648451ffe9ba3d4991a5c"; - sha256 = "0zqsr874symg1nzrpfqxk9haxkymyhlw8g96w2xmjzhskkfrm5j7"; - }; - }; - "https://repo.clojars.org/lein-kibit/lein-kibit/0.1.5/lein-kibit-0.1.5" = - { - host = repositories.clojars; - path = - "lein-kibit/lein-kibit/0.1.5/lein-kibit-0.1.5"; - type = "jar"; - pom = { - sha1 = "de558f80dff1164d9acb8afee8253da75404d446"; - sha256 = "1jpzh2fh84pcqrd9mx1392pxmkr34i0y46aym7shrbnv9gh64kl3"; - }; - jar = { - sha1 = "67e7e2b5206fdb837d8f72c6adeea49d2799250d"; - sha256 = "0g7zk6lmsvqs9xpq2zldafg2pn22fyhk2sy3f6gglkb6f4jv3ih2"; - }; - }; "https://repo.clojars.org/lein-re-frisk/lein-re-frisk/0.5.8/lein-re-frisk-0.5.8" = { host = repositories.clojars; @@ -3721,21 +3500,6 @@ in { sha256 = "0xffg2cydhr9k548w9w6ii6hkw7adicxr6i5s3wa77iz6c95j1za"; }; }; - "https://repo.clojars.org/org/clojars/brenton/google-diff-match-patch/0.1/google-diff-match-patch-0.1" = - { - host = repositories.clojars; - path = - "org/clojars/brenton/google-diff-match-patch/0.1/google-diff-match-patch-0.1"; - type = "jar"; - pom = { - sha1 = "0481993f3031d769c2a71d766938851eaa1aa1bd"; - sha256 = "1plq1cnxs3jnvgh6sq7najp7s1iyymi8mbrc3hmfm90yp159nj45"; - }; - jar = { - sha1 = "4ee93c837a03baba9351a7d7aefef06f59bb29df"; - sha256 = "0hm63p3na1j60cgb6j6nchmdshil9lfhkkc74zxb8qhk7l63q478"; - }; - }; "https://repo.clojars.org/quoin/quoin/0.1.2/quoin-0.1.2" = { host = repositories.clojars; @@ -3751,21 +3515,6 @@ in { sha256 = "0b5rc1cmbgg8qpl80jyvh0ldgs7dv86c0qxixazdnz05limmnpb5"; }; }; - "https://repo.clojars.org/rasom/cljs-react-navigation/0.1.4/cljs-react-navigation-0.1.4" = - { - host = repositories.clojars; - path = - "rasom/cljs-react-navigation/0.1.4/cljs-react-navigation-0.1.4"; - type = "jar"; - pom = { - sha1 = "0fbb5e16413bb90b0d31f44d3a6059c7afd41f91"; - sha256 = "1lc2v88vwq6rd8hw2v4xnf0b0jfzypwvj62sk4xnhhnxmnj5g2rm"; - }; - jar = { - sha1 = "7629c8d741da494b9b955d2b6939718d2da2aae1"; - sha256 = "031hardnlrmdvb8v3vl468rcb47yksfqxp22a1bsa46fxcnhpyfd"; - }; - }; "https://repo.clojars.org/rasom/lein-githooks/0.1.5/lein-githooks-0.1.5" = { host = repositories.clojars; @@ -3826,21 +3575,6 @@ in { sha256 = "1ffn63mnsyvllv97pns71r7ky1pjsml193ry6ai9ag8plj4wg51m"; }; }; - "https://repo.clojars.org/refactor-nrepl/refactor-nrepl/2.3.0-SNAPSHOT/refactor-nrepl-2.3.0-20170531.195417-17" = - { - host = repositories.clojars; - path = - "refactor-nrepl/refactor-nrepl/2.3.0-SNAPSHOT/refactor-nrepl-2.3.0-20170531.195417-17"; - type = "jar"; - pom = { - sha1 = "f445d75b95750d0b333cfb7bc3a6e9008ded37a4"; - sha256 = "0xbdav73frlc1lcjslc31p6wbqd6flx681khydnqr6phs72ca6vz"; - }; - jar = { - sha1 = "63453e1784248d1bff785d37007da5fa15f28fd7"; - sha256 = "1bl505jdnb911xrdl39072g82ag3y0mgwkqs1qy81yxa8dsw4grf"; - }; - }; "https://repo.clojars.org/re-frame/re-frame/0.10.1/re-frame-0.10.1" = { host = repositories.clojars; @@ -3856,21 +3590,6 @@ in { sha256 = "0qb4dmyk10hcc88sl14jxq2s0yifrc0x71fxy76w2iqlql03ri6w"; }; }; - "https://repo.clojars.org/re-frame/re-frame/0.10.4/re-frame-0.10.4" = - { - host = repositories.clojars; - path = - "re-frame/re-frame/0.10.4/re-frame-0.10.4"; - type = "jar"; - pom = { - sha1 = "bf80f894d53bac6b8913d079f6a988d9a7fa78cc"; - sha256 = "1mxxc5vjkajxf838gbgnzdsmdz90nb1pg8f800xh876bc8a9ypj7"; - }; - jar = { - sha1 = "98c2f670c940e0d9e2486edf524875759aad14c4"; - sha256 = "1fniid7vh3b9bqd6gpzzx616ldmi8z7abig9fclp6y80rki7x6z7"; - }; - }; "https://repo.clojars.org/re-frisk/re-frisk/0.5.4/re-frisk-0.5.4" = { host = repositories.clojars; @@ -3916,21 +3635,6 @@ in { sha256 = "1ijmyj8m1n189szrdppmhkrhi62r07gkwgrxc7yynv72gnc4vwmb"; }; }; - "https://repo.clojars.org/rewrite-clj/rewrite-clj/0.4.12/rewrite-clj-0.4.12" = - { - host = repositories.clojars; - path = - "rewrite-clj/rewrite-clj/0.4.12/rewrite-clj-0.4.12"; - type = "jar"; - pom = { - sha1 = "1160fe13d24da3064e3f07ff5cc8b3dbb03b07dd"; - sha256 = "0y4zm66683bgpfi1abh83mdwpx81sslf7sxiwsg0jsbapwhr0gzy"; - }; - jar = { - sha1 = "5de28f0b2ccc521207faa281f0f6d10a442e97f4"; - sha256 = "0i9mawdlmllgiz95m2i37r0bs5913nhi5m1absnbhsfdnar1wrdp"; - }; - }; "https://repo.clojars.org/rewrite-clj/rewrite-clj/0.5.2/rewrite-clj-0.5.2" = { host = repositories.clojars; 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 8fd92a1a989..0b42fdedfd0 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,28 +1,21 @@ -https://repo.gradle.org/gradle/libs-releases-local/org/gradle/gradle-base-services-groovy/2.1/gradle-base-services-groovy-2.1 -https://repo.gradle.org/gradle/libs-releases-local/org/gradle/gradle-base-services-groovy/2.2.1/gradle-base-services-groovy-2.2.1 -https://repo.gradle.org/gradle/libs-releases-local/org/gradle/gradle-base-services-groovy/3.1/gradle-base-services-groovy-3.1 -https://repo.gradle.org/gradle/libs-releases-local/org/gradle/gradle-base-services/2.1/gradle-base-services-2.1 -https://repo.gradle.org/gradle/libs-releases-local/org/gradle/gradle-base-services/2.2.1/gradle-base-services-2.2.1 -https://repo.gradle.org/gradle/libs-releases-local/org/gradle/gradle-base-services/3.1/gradle-base-services-3.1 -https://repo.gradle.org/gradle/libs-releases-local/org/gradle/gradle-core/2.1/gradle-core-2.1 -https://repo.gradle.org/gradle/libs-releases-local/org/gradle/gradle-core/2.2.1/gradle-core-2.2.1 -https://repo.gradle.org/gradle/libs-releases-local/org/gradle/gradle-core/3.1/gradle-core-3.1 -https://repo.gradle.org/gradle/libs-releases-local/org/gradle/gradle-logging/3.1/gradle-logging-3.1 -https://repo.gradle.org/gradle/libs-releases-local/org/gradle/gradle-messaging/2.1/gradle-messaging-2.1 -https://repo.gradle.org/gradle/libs-releases-local/org/gradle/gradle-messaging/2.2.1/gradle-messaging-2.2.1 -https://repo.gradle.org/gradle/libs-releases-local/org/gradle/gradle-messaging/3.1/gradle-messaging-3.1 -https://repo.gradle.org/gradle/libs-releases-local/org/gradle/gradle-resources/2.1/gradle-resources-2.1 -https://repo.gradle.org/gradle/libs-releases-local/org/gradle/gradle-resources/2.2.1/gradle-resources-2.2.1 -https://repo.gradle.org/gradle/libs-releases-local/org/gradle/gradle-resources/3.1/gradle-resources-3.1 +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/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 https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.0.0/appcompat-1.0.0 https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.0.2/appcompat-1.0.2 +https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.1.0-rc01/appcompat-1.1.0-rc01 +https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.1.0/appcompat-1.1.0 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/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/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 https://dl.google.com/dl/android/maven2/androidx/customview/customview/1.0.0/customview-1.0.0 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/3.2.1/databinding-common-3.2.1 @@ -35,26 +28,37 @@ 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/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-livedata-core/2.0.0/lifecycle-livedata-core-2.0.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-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/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/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/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 +https://dl.google.com/dl/android/maven2/androidx/vectordrawable/vectordrawable/1.1.0/vectordrawable-1.1.0 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/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 @@ -179,6 +183,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/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 @@ -520,10 +525,6 @@ https://repo.maven.apache.org/maven2/com/barchart/base/barchart-archon/2.5.10/ba https://repo.maven.apache.org/maven2/com/barchart/udt/barchart-udt-archon/2.3.0/barchart-udt-archon-2.3.0 https://repo.maven.apache.org/maven2/com/barchart/udt/barchart-udt-bundle/2.3.0/barchart-udt-bundle-2.3.0 https://repo.maven.apache.org/maven2/com/beust/jcommander/1.47/jcommander-1.47 -https://repo.maven.apache.org/maven2/com/esotericsoftware/kryo/kryo/2.20/kryo-2.20 -https://repo.maven.apache.org/maven2/com/esotericsoftware/minlog/minlog/1.2/minlog-1.2 -https://repo.maven.apache.org/maven2/com/esotericsoftware/reflectasm/reflectasm/1.07/reflectasm-1.07 -https://repo.maven.apache.org/maven2/com/esotericsoftware/reflectasm/reflectasm/1.07/reflectasm-1.07-shaded https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.3.0/jackson-annotations-2.3.0 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.3.1/jackson-annotations-2.3.1 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-core/2.3.1/jackson-core-2.3.1 @@ -565,8 +566,6 @@ https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2. https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.3.1/error_prone_parent-2.3.1 https://repo.maven.apache.org/maven2/com/google/google/1/google-1 https://repo.maven.apache.org/maven2/com/google/google/5/google-5 -https://repo.maven.apache.org/maven2/com/google/guava/guava-jdk5/17.0/guava-jdk5-17.0 -https://repo.maven.apache.org/maven2/com/google/guava/guava-parent-jdk5/17.0/guava-parent-jdk5-17.0 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/10.0.1/guava-parent-10.0.1 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/14.0.1/guava-parent-14.0.1 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/16.0.1/guava-parent-16.0.1 @@ -1718,14 +1717,12 @@ https://repo.maven.apache.org/maven2/org/mortbay/jetty/project/6.1.26/project-6. https://repo.maven.apache.org/maven2/org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211 https://repo.maven.apache.org/maven2/org/multiverse/multiverse-core/0.7.0/multiverse-core-0.7.0 https://repo.maven.apache.org/maven2/org/multiverse/multiverse/0.7.0/multiverse-0.7.0 -https://repo.maven.apache.org/maven2/org/objenesis/objenesis-parent/1.2/objenesis-parent-1.2 https://repo.maven.apache.org/maven2/org/objenesis/objenesis-parent/1.3/objenesis-parent-1.3 https://repo.maven.apache.org/maven2/org/objenesis/objenesis-parent/2.1/objenesis-parent-2.1 https://repo.maven.apache.org/maven2/org/objenesis/objenesis-parent/2.5/objenesis-parent-2.5 https://repo.maven.apache.org/maven2/org/objenesis/objenesis-parent/2.6/objenesis-parent-2.6 https://repo.maven.apache.org/maven2/org/objenesis/objenesis-parent/3.0.1/objenesis-parent-3.0.1 https://repo.maven.apache.org/maven2/org/objenesis/objenesis/1.0/objenesis-1.0 -https://repo.maven.apache.org/maven2/org/objenesis/objenesis/1.2/objenesis-1.2 https://repo.maven.apache.org/maven2/org/objenesis/objenesis/1.3/objenesis-1.3 https://repo.maven.apache.org/maven2/org/objenesis/objenesis/2.1/objenesis-2.1 https://repo.maven.apache.org/maven2/org/objenesis/objenesis/2.5/objenesis-2.5 @@ -1742,14 +1739,12 @@ https://repo.maven.apache.org/maven2/org/osgi/org.osgi.core/4.1.0/org.osgi.core- https://repo.maven.apache.org/maven2/org/osgi/org.osgi.core/4.2.0/org.osgi.core-4.2.0 https://repo.maven.apache.org/maven2/org/osgi/org.osgi.core/4.3.1/org.osgi.core-4.3.1 https://repo.maven.apache.org/maven2/org/osgi/org.osgi.core/6.0.0/org.osgi.core-6.0.0 -https://repo.maven.apache.org/maven2/org/ow2/asm/asm-parent/4.0/asm-parent-4.0 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-parent/5.0.1/asm-parent-5.0.1 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-parent/5.0.2/asm-parent-5.0.2 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-parent/5.0.3/asm-parent-5.0.3 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-parent/5.0.4/asm-parent-5.0.4 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-parent/5.1/asm-parent-5.1 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-parent/6.0/asm-parent-6.0 -https://repo.maven.apache.org/maven2/org/ow2/asm/asm/4.0/asm-4.0 https://repo.maven.apache.org/maven2/org/ow2/asm/asm/5.0.2/asm-5.0.2 https://repo.maven.apache.org/maven2/org/ow2/asm/asm/6.1.1/asm-6.1.1 https://repo.maven.apache.org/maven2/org/ow2/ow2/1.3/ow2-1.3 @@ -1773,7 +1768,6 @@ https://repo.maven.apache.org/maven2/org/slf4j/jcl-over-slf4j/1.7.5/jcl-over-slf https://repo.maven.apache.org/maven2/org/slf4j/jcl-over-slf4j/1.7.7/jcl-over-slf4j-1.7.7 https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.5.6/slf4j-api-1.5.6 https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4 -https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.10/slf4j-api-1.7.10 https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.19/slf4j-api-1.7.19 https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25 https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.5/slf4j-api-1.7.5 @@ -1781,7 +1775,6 @@ https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.7/slf4j-api-1.7.7 https://repo.maven.apache.org/maven2/org/slf4j/slf4j-jdk14/1.5.6/slf4j-jdk14-1.5.6 https://repo.maven.apache.org/maven2/org/slf4j/slf4j-parent/1.5.6/slf4j-parent-1.5.6 https://repo.maven.apache.org/maven2/org/slf4j/slf4j-parent/1.6.4/slf4j-parent-1.6.4 -https://repo.maven.apache.org/maven2/org/slf4j/slf4j-parent/1.7.10/slf4j-parent-1.7.10 https://repo.maven.apache.org/maven2/org/slf4j/slf4j-parent/1.7.19/slf4j-parent-1.7.19 https://repo.maven.apache.org/maven2/org/slf4j/slf4j-parent/1.7.2/slf4j-parent-1.7.2 https://repo.maven.apache.org/maven2/org/slf4j/slf4j-parent/1.7.25/slf4j-parent-1.7.25 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 706b3cca604..7e9f664d0f7 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 @@ -7,7 +7,7 @@ let clojars = "https://repo.clojars.org"; fabric-io = "https://maven.fabric.io/public"; google = "https://dl.google.com/dl/android/maven2"; - gradle = "https://repo.gradle.org/gradle/libs-releases-local"; + gradle = "http://repo.gradle.org/gradle/libs-releases-local"; gradlePlugins = "https://plugins.gradle.org/m2"; java = "https://maven.java.net/content/repositories/releases"; jcenter = "https://jcenter.bintray.com"; @@ -20,289 +20,124 @@ let }; in { - "https://repo.gradle.org/gradle/libs-releases-local/org/gradle/gradle-base-services-groovy/2.1/gradle-base-services-groovy-2.1" = + "https://dl.google.com/dl/android/maven2/androidx/activity/activity/1.0.0/activity-1.0.0" = { - host = repositories.gradle; - path = - "org/gradle/gradle-base-services-groovy/2.1/gradle-base-services-groovy-2.1"; - type = "jar"; - pom = { - sha1 = "ccac73bb7184768905f402042c0d8578e9dae007"; - sha256 = "1wqpy25wdcrywjxld13pna7npwrh6zp8rfjnzgfprb5b5jyjp510"; - }; - jar = { - sha1 = "c19534da0e1547f510fe054d2ca038a743b8ed5b"; - sha256 = "02iqr1sjhpdb6va8kfsbggmkzns9xhxrkfihz992aalazm81f612"; - }; - }; - "https://repo.gradle.org/gradle/libs-releases-local/org/gradle/gradle-base-services-groovy/2.2.1/gradle-base-services-groovy-2.2.1" = - { - host = repositories.gradle; - path = - "org/gradle/gradle-base-services-groovy/2.2.1/gradle-base-services-groovy-2.2.1"; - type = "jar"; - pom = { - sha1 = "60afd5575c876f582bea8062d908ad32758ea811"; - sha256 = "124idvay5l85b92r5kzm99zq3zkb00g8y6zmp49f4f989lqh29rx"; - }; - jar = { - sha1 = "5875b51c9d579de53ce05ea89ebf5a823e2fc0f6"; - sha256 = "0dsd7mdlpabdxc3apazvwbcvnx6d4xrnr5syp3fbmxypvcxys8zg"; - }; - }; - "https://repo.gradle.org/gradle/libs-releases-local/org/gradle/gradle-base-services-groovy/3.1/gradle-base-services-groovy-3.1" = - { - host = repositories.gradle; - path = - "org/gradle/gradle-base-services-groovy/3.1/gradle-base-services-groovy-3.1"; - type = "jar"; - pom = { - sha1 = "0f59d4b3ffee0a8ae0455237c50283a1fee8f789"; - sha256 = "1712qg4qik15fx8a7y1hwwcmrfag2d5c259lrv879xvsnvh5kh3j"; - }; - jar = { - sha1 = "61adc13a045357c99a7bc8c70ccb6955e80eda7c"; - sha256 = "0pv1pqlwj8zggxybcvdna77xgc1687zgmz57k5405ffj4bixdbpg"; - }; - }; - "https://repo.gradle.org/gradle/libs-releases-local/org/gradle/gradle-base-services/2.1/gradle-base-services-2.1" = - { - host = repositories.gradle; - path = - "org/gradle/gradle-base-services/2.1/gradle-base-services-2.1"; - type = "jar"; - pom = { - sha1 = "e929a5ad4aa9848ebb5b3dbb2d73585b558b851f"; - sha256 = "037dj6p24wbw5ncv9981qrkxskl98qlihsvwkvwl7h5vjqfinzvk"; - }; - jar = { - sha1 = "8078ab01c8acaf7420ee878582c1a3220677cddc"; - sha256 = "1wcifqjz7lgyi1nsjdkpbpij2rqap4bciwmqx1lw924p0355q07d"; - }; - }; - "https://repo.gradle.org/gradle/libs-releases-local/org/gradle/gradle-base-services/2.2.1/gradle-base-services-2.2.1" = - { - host = repositories.gradle; - path = - "org/gradle/gradle-base-services/2.2.1/gradle-base-services-2.2.1"; - type = "jar"; - pom = { - sha1 = "ec4de94aa2ae0c5a42656a3df23d969524758131"; - sha256 = "0mf3y655zxkr5l851cbd05p8brv92vk3n81fpir5y3ajc0x88n3s"; - }; - jar = { - sha1 = "9686a37f845c7b554d0b55724e21e5ff84d9e1c1"; - sha256 = "0hayad4mynnv4irqabxc4j0vqk17yp5q3r9xfafisv4s0nsk4849"; - }; - }; - "https://repo.gradle.org/gradle/libs-releases-local/org/gradle/gradle-base-services/3.1/gradle-base-services-3.1" = - { - host = repositories.gradle; - path = - "org/gradle/gradle-base-services/3.1/gradle-base-services-3.1"; - type = "jar"; - pom = { - sha1 = "9919c78117bd8fe26b67000e25f19e2dac5b423b"; - sha256 = "19ryx76klirl8ql1kasijwsaykqv2xs70mzdcvw53sg35dhq0min"; - }; - jar = { - sha1 = "33e7db611deb096e92e5fcf9e9007a9f08002801"; - sha256 = "146bvpjsw96a1m2y4v3bmsjzmhjm7bq7zlvpdzl1s8g34k0dpn83"; - }; - }; - "https://repo.gradle.org/gradle/libs-releases-local/org/gradle/gradle-core/2.1/gradle-core-2.1" = - { - host = repositories.gradle; - path = - "org/gradle/gradle-core/2.1/gradle-core-2.1"; - type = "jar"; - pom = { - sha1 = "bf070cdb93383804cdad252089c473d5cc65dbb2"; - sha256 = "1iraj3rvsjd5z4qb4g82za5y2p3glpkdb4070wdyr25bywk17mam"; - }; - jar = { - sha1 = "448579eb9b1ebb52ac3a099baade52876b37c1bf"; - sha256 = "0mwb51jf2bcdwv6gy5sj4gcq3g81nxjb5d58wghz7l5cwjj1arr0"; - }; - }; - "https://repo.gradle.org/gradle/libs-releases-local/org/gradle/gradle-core/2.2.1/gradle-core-2.2.1" = - { - host = repositories.gradle; - path = - "org/gradle/gradle-core/2.2.1/gradle-core-2.2.1"; - type = "jar"; - pom = { - sha1 = "518c5eb230e15e9f3d743489fbb80860e8acec62"; - sha256 = "0llgyi9wfjhdrx005444pv9ar02bvcgdaq6gzmvyafg8jlp3m8h0"; - }; - jar = { - sha1 = "60128a00fcf9428e90d59fd65608965e84b66420"; - sha256 = "1wvpwy5q2i3pvialcip7nz54rbiahq548kkpvr1p6xgn97z9ms8n"; - }; - }; - "https://repo.gradle.org/gradle/libs-releases-local/org/gradle/gradle-core/3.1/gradle-core-3.1" = - { - host = repositories.gradle; - path = - "org/gradle/gradle-core/3.1/gradle-core-3.1"; - type = "jar"; - pom = { - sha1 = "26675e59c68aa16f5bde212c8640c41086aae4d7"; - sha256 = "0mf0cfzlq4cakdmix7bhd0kjlj01lk0678v5w43x4viffffsj090"; - }; - jar = { - sha1 = "864f9d0156e49d1101759745f0e3ab096533ec01"; - sha256 = "0k925r1pqk638cia6k9qklkl8mkcfgh3l6pbbxwxmgs43f9insff"; - }; - }; - "https://repo.gradle.org/gradle/libs-releases-local/org/gradle/gradle-logging/3.1/gradle-logging-3.1" = - { - host = repositories.gradle; - path = - "org/gradle/gradle-logging/3.1/gradle-logging-3.1"; - type = "jar"; - pom = { - sha1 = "bfc6ca5d69246cb407120e6632a5cacfcbee3ccd"; - sha256 = "0gjgq9gppzkvd95qxlx2ihybg66nabp2kppkl5b07yk7p1p8j7ss"; - }; - jar = { - sha1 = "1497c134a31ed4c347ba62be68c86885b64eee2c"; - sha256 = "1sllfk9rsv55cgbka4h91grn4z6sx9dijwjqrhii4cpl056dwmjj"; - }; - }; - "https://repo.gradle.org/gradle/libs-releases-local/org/gradle/gradle-messaging/2.1/gradle-messaging-2.1" = - { - host = repositories.gradle; - path = - "org/gradle/gradle-messaging/2.1/gradle-messaging-2.1"; - type = "jar"; - pom = { - sha1 = "ff10ff2518c0fe18941e93dae462be088e69e9ef"; - sha256 = "0v7frbjfi3vmi65zm2n0p7dnyli3cbnacc9zwmhmr6c9klzxlpz1"; - }; - jar = { - sha1 = "e73cfd37ca09295dd3d106b2dc76494c90bd6fbb"; - sha256 = "1w92sa0fb51sgpa50014b45lwgw4a7p6fl0qgpag2h1j0gcmlgza"; - }; - }; - "https://repo.gradle.org/gradle/libs-releases-local/org/gradle/gradle-messaging/2.2.1/gradle-messaging-2.2.1" = - { - host = repositories.gradle; + host = repositories.google; path = - "org/gradle/gradle-messaging/2.2.1/gradle-messaging-2.2.1"; - type = "jar"; + "androidx/activity/activity/1.0.0/activity-1.0.0"; + type = "aar"; pom = { - sha1 = "40de72142fadcd775596c620aabffaa5983b1e15"; - sha256 = "1mhqa4hijzb66jpzljli7b937h2baa0bwyj6lwwj0pdm165mpmyr"; + sha1 = "f94af7350c14b899596aefd6c50e381a96d933ba"; + sha256 = "10lv8v4dg1jfvmhznia10wsgqxi0inbs0cdql0nk3732c9sbx917"; }; jar = { - sha1 = "1e1d6ef285891a40a04dfa360e3e53b43e2c1a84"; - sha256 = "1x7vqdcjrmk279blih6sw5b5pjfsxnag1bmckxmz949isa4xay2b"; + sha1 = "ed7a64df6e3fbebf7d3d3dfc30b0f47efcc707f7"; + sha256 = "0gacyh2zf933lcdkl2drim3knhaj9pgl936q2m256bjw8m19ig6i"; }; }; - "https://repo.gradle.org/gradle/libs-releases-local/org/gradle/gradle-messaging/3.1/gradle-messaging-3.1" = + "https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.0.0/annotation-1.0.0" = { - host = repositories.gradle; + host = repositories.google; path = - "org/gradle/gradle-messaging/3.1/gradle-messaging-3.1"; + "androidx/annotation/annotation/1.0.0/annotation-1.0.0"; type = "jar"; pom = { - sha1 = "1a02aa908fdc0a53d016981557e651312123174d"; - sha256 = "13iy1rghsjl1afml5h73d0w9mna51nmnwxqg9q2l1qxlj0ypyyl8"; + sha1 = "1ec1fd6918db230c4b2e8ffa78f724267fb6328c"; + sha256 = "1d75s454jy1b88fra6s0wm5m15ml3n0z8qyvr400771xnhnw2yd1"; }; jar = { - sha1 = "e9c31a949e904c40178e9276e0040200067fb9b7"; - sha256 = "0c7q6fs8ywciif1k4gz40dm17976b8bh9hahi2r2p18j6xb5xpc9"; + sha1 = "45599f2cd5965ac05a1488fa2a5c0cdd7c499ead"; + sha256 = "05n0yygdjlvvkb67vlfisiasz4xsj55k416dh2m55bvwbxsykahb"; }; }; - "https://repo.gradle.org/gradle/libs-releases-local/org/gradle/gradle-resources/2.1/gradle-resources-2.1" = + "https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.1.0/annotation-1.1.0" = { - host = repositories.gradle; + host = repositories.google; path = - "org/gradle/gradle-resources/2.1/gradle-resources-2.1"; + "androidx/annotation/annotation/1.1.0/annotation-1.1.0"; type = "jar"; pom = { - sha1 = "64da665bcaa4edad053ea03e0949f6a3e0d993c6"; - sha256 = "0kswdhkwl32sc9w2qbpa66sbvhriiax370rbixg1zmfmzw60k5yg"; + sha1 = "404526f88e3a7efa04f1c99074dfc10aff9061ee"; + sha256 = "1zlyg49llmpnhmhr4z17wp0q51phw5k6py6v5aal9vw0fyx754rf"; }; jar = { - sha1 = "4d64f1ac8b345525503ce5a46ab1e345914df583"; - sha256 = "055iangccx3p83rsi61axggw8fzx1pyl9jk0qirclcyd8nfksjdw"; + sha1 = "e3a6fb2f40e3a3842e6b7472628ba4ce416ea4c8"; + sha256 = "14mnsnd1a6wrzadh8air665ylbb9i9gz1ajhin0nf50gngnn73fk"; }; }; - "https://repo.gradle.org/gradle/libs-releases-local/org/gradle/gradle-resources/2.2.1/gradle-resources-2.2.1" = + "https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat-resources/1.1.0/appcompat-resources-1.1.0" = { - host = repositories.gradle; + host = repositories.google; path = - "org/gradle/gradle-resources/2.2.1/gradle-resources-2.2.1"; - type = "jar"; + "androidx/appcompat/appcompat-resources/1.1.0/appcompat-resources-1.1.0"; + type = "aar"; pom = { - sha1 = "7d7feabef40c3ac9eb3dc4dc9d55edc879548e49"; - sha256 = "1wz0mayzk6plh5vvsj8mvxzzn74a163m75wxbdml8llhrn62p21h"; + sha1 = "04d25219b17a53da24285e9560bbf5c587abee38"; + sha256 = "1wlhjv2g94w40vczb0vl8avg23hia4ancr95hha6y6xhdkhi2q04"; }; jar = { - sha1 = "3fcd7004383a672c97346ad684dd762c547cdccb"; - sha256 = "1qysny46n4g2xq5dbmlrh6c189jbd8wx7x3jn99bvk01h1lydlhy"; + sha1 = "a573b2ab146d686244721ef1038d08043f18c67f"; + sha256 = "0qbk5wi4yd4l4w4f5jdgm9xvszw3jm5qj8by6iya2lb5nhr4v50r"; }; }; - "https://repo.gradle.org/gradle/libs-releases-local/org/gradle/gradle-resources/3.1/gradle-resources-3.1" = + "https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.0.0/appcompat-1.0.0" = { - host = repositories.gradle; + host = repositories.google; path = - "org/gradle/gradle-resources/3.1/gradle-resources-3.1"; - type = "jar"; + "androidx/appcompat/appcompat/1.0.0/appcompat-1.0.0"; + type = "aar"; pom = { - sha1 = "2354cec814a016ef061bf68deab493162332b712"; - sha256 = "0vjy1hdw5gv26g73ck8kh87jkvi7dwczcf7y0dhrr42p9cfzdzcf"; + sha1 = "5ce716d352f95b3c0ea0ecf9f579691c1a79410f"; + sha256 = "0asdria39qs9hf18wwpm11pp2bqvwzci9pr75lpb4ch8p36kyb10"; }; jar = { - sha1 = "f8386a67e8e76c43adf65b1923ed26e0ec1ded2a"; - sha256 = "0c2l6h2s4qfkn0kc07pnv5j4b8wmvbqjrg2shxbi5wsjji2f9px3"; + sha1 = "155b5a7193b5b87c3ece2ec444c85cd8de2347dd"; + sha256 = "1kjndp9mip46205znb028ngi7vrvpkca8698dcrd7jrn43hm8hlr"; }; }; - "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/appcompat/appcompat/1.0.2/appcompat-1.0.2" = { host = repositories.google; path = - "androidx/annotation/annotation/1.0.0/annotation-1.0.0"; - type = "jar"; + "androidx/appcompat/appcompat/1.0.2/appcompat-1.0.2"; + type = "aar"; pom = { - sha1 = "1ec1fd6918db230c4b2e8ffa78f724267fb6328c"; - sha256 = "1d75s454jy1b88fra6s0wm5m15ml3n0z8qyvr400771xnhnw2yd1"; + sha1 = "c9d71a88fea7f0af4bf936ec095161ebc5a57f12"; + sha256 = "0bw5zydwk5nr55q97x653rfinwl6fvqd32dbvzs11xw9s9bv14g3"; }; jar = { - sha1 = "45599f2cd5965ac05a1488fa2a5c0cdd7c499ead"; - sha256 = "05n0yygdjlvvkb67vlfisiasz4xsj55k416dh2m55bvwbxsykahb"; + sha1 = "002533a36c928bb27a3cc6843a25f83754b3c3ae"; + sha256 = "00qdpzv9ajq8dvvyvkqiq8g03023gmjv2a6lz5rcnmjwbvfhq253"; }; }; - "https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.0.0/appcompat-1.0.0" = + "https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.1.0-rc01/appcompat-1.1.0-rc01" = { host = repositories.google; path = - "androidx/appcompat/appcompat/1.0.0/appcompat-1.0.0"; + "androidx/appcompat/appcompat/1.1.0-rc01/appcompat-1.1.0-rc01"; type = "aar"; pom = { - sha1 = "5ce716d352f95b3c0ea0ecf9f579691c1a79410f"; - sha256 = "0asdria39qs9hf18wwpm11pp2bqvwzci9pr75lpb4ch8p36kyb10"; + sha1 = "49c937cd4c8edaa42aefa8eb7b9adffc3c5362c3"; + sha256 = "0gy1y4rw48iljrii6hg34lh9ydb2m8filvych6rmlsy7j5dgps7x"; }; jar = { - sha1 = "155b5a7193b5b87c3ece2ec444c85cd8de2347dd"; - sha256 = "1kjndp9mip46205znb028ngi7vrvpkca8698dcrd7jrn43hm8hlr"; + sha1 = "62955e0a3c6f4566648f30da6e40e44b01221422"; + sha256 = "0kv75gf28rm5xbh8dxsaz4vkiz8s5am5bcdxka92wkyv4hx3n4cm"; }; }; - "https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.0.2/appcompat-1.0.2" = + "https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.1.0/appcompat-1.1.0" = { host = repositories.google; path = - "androidx/appcompat/appcompat/1.0.2/appcompat-1.0.2"; + "androidx/appcompat/appcompat/1.1.0/appcompat-1.1.0"; type = "aar"; pom = { - sha1 = "c9d71a88fea7f0af4bf936ec095161ebc5a57f12"; - sha256 = "0bw5zydwk5nr55q97x653rfinwl6fvqd32dbvzs11xw9s9bv14g3"; + sha1 = "83765254bf5e6aa04bb1f35960db460afd70b048"; + sha256 = "1fdp5i5ri67xnvf1r2hcdlkl5rd3g8sqy338lq18xvzq45qn239l"; }; jar = { - sha1 = "002533a36c928bb27a3cc6843a25f83754b3c3ae"; - sha256 = "00qdpzv9ajq8dvvyvkqiq8g03023gmjv2a6lz5rcnmjwbvfhq253"; + sha1 = "351d3409fe51f3d862bd2b1bcc0f3b6ded29460e"; + sha256 = "1h5m5ajd7b66dilfh8z2zs0zqnglrdm7d5amgzqvvcscljy9jwld"; }; }; "https://dl.google.com/dl/android/maven2/androidx/arch/core/core-common/2.0.0/core-common-2.0.0" = @@ -320,6 +155,21 @@ in { sha256 = "1n3sqpd398a23jdqwpql9ls0if23vzhaj37fn1j6wllvfwvv702b"; }; }; + "https://dl.google.com/dl/android/maven2/androidx/arch/core/core-common/2.1.0/core-common-2.1.0" = + { + host = repositories.google; + path = + "androidx/arch/core/core-common/2.1.0/core-common-2.1.0"; + type = "jar"; + pom = { + sha1 = "2b3b788454b0aa77266f2ce191eba3a7768678ca"; + sha256 = "00fgwnngz2qbicwajshx599l3r0ljjslrjb6qc561g5a1sbb7fw3"; + }; + jar = { + sha1 = "b3152fc64428c9354344bd89848ecddc09b6f07e"; + sha256 = "129qclk47ifk57y8d135lfqchx7gffpswfgy55zkw1lx0azkf4py"; + }; + }; "https://dl.google.com/dl/android/maven2/androidx/arch/core/core-runtime/2.0.0/core-runtime-2.0.0" = { host = repositories.google; @@ -350,6 +200,21 @@ in { sha256 = "12vcz7x5c693gicyr8g1mbm1nq80fvz34n170sxr9pddaw6bdspp"; }; }; + "https://dl.google.com/dl/android/maven2/androidx/cardview/cardview/1.0.0/cardview-1.0.0" = + { + host = repositories.google; + path = + "androidx/cardview/cardview/1.0.0/cardview-1.0.0"; + type = "aar"; + pom = { + sha1 = "93a261514381247a8a6bebe171338f9f2f883f27"; + sha256 = "0v1y3h373chacgpbwi662jq3s58v1bl6z7jrggi8ydaqighg8kp6"; + }; + jar = { + sha1 = "158dbc2e2bc502815821191b04446b8f663c1874"; + sha256 = "1izy3bd2vn4rzf3mvgdnf5mdxbfnb664x7xfdnabbmm3496c14qi"; + }; + }; "https://dl.google.com/dl/android/maven2/androidx/collection/collection/1.0.0/collection-1.0.0" = { host = repositories.google; @@ -365,6 +230,21 @@ in { sha256 = "1yf979z85xq8lxr06mqkc31icns9bgh5gf7yrnhj1h9bbixi33cw"; }; }; + "https://dl.google.com/dl/android/maven2/androidx/collection/collection/1.1.0/collection-1.1.0" = + { + host = repositories.google; + path = + "androidx/collection/collection/1.1.0/collection-1.1.0"; + type = "jar"; + pom = { + sha1 = "e1eba7bcd8a98744b7850e5c474edebaafba6fbb"; + sha256 = "1lan6jd3r0g1n5q4z3hizxbq0fd03g1r70jhrkiwdzdclin0dsb7"; + }; + jar = { + sha1 = "1f27220b47669781457de0d600849a5de0e89909"; + sha256 = "0wivsgvxlxqcha3sf1s2f8vi0a9a54798llk81sff7a60xa0wak3"; + }; + }; "https://dl.google.com/dl/android/maven2/androidx/coordinatorlayout/coordinatorlayout/1.0.0/coordinatorlayout-1.0.0" = { host = repositories.google; @@ -395,6 +275,21 @@ in { sha256 = "167rc0s7c8wlzf6i9d1pd8y4dpmw7m4i5yd4nxgqrb9cq8i0badi"; }; }; + "https://dl.google.com/dl/android/maven2/androidx/core/core/1.1.0/core-1.1.0" = + { + host = repositories.google; + path = + "androidx/core/core/1.1.0/core-1.1.0"; + type = "aar"; + pom = { + sha1 = "2a6d529fdea6d3525bd70f46b6f1fc1a580a8513"; + sha256 = "0k3ma57ilij3rp6iq416dndqd42qss7vfz2z8acbfindrlr63r6s"; + }; + jar = { + sha1 = "b9addd897d6b9c8634fe789bdb82f993171432ae"; + sha256 = "0zk4av88i842a7754fwsmh49qac9x24irgw3d6dc1qvgb6zczivn"; + }; + }; "https://dl.google.com/dl/android/maven2/androidx/cursoradapter/cursoradapter/1.0.0/cursoradapter-1.0.0" = { host = repositories.google; @@ -575,6 +470,21 @@ in { sha256 = "1y0qnp8644b1qx0ag0kzj8w70c09mnqwz9l9g7kk4np63zbk5pb5"; }; }; + "https://dl.google.com/dl/android/maven2/androidx/fragment/fragment/1.1.0/fragment-1.1.0" = + { + host = repositories.google; + path = + "androidx/fragment/fragment/1.1.0/fragment-1.1.0"; + type = "aar"; + pom = { + sha1 = "753e03826c6efdace71d94ed9d04bf008fa6ad3d"; + sha256 = "0i15nlfh2lbjyzydby2k32h3fa1sqxbki2jzbmag7p82mhkyny7g"; + }; + jar = { + sha1 = "5f9efc7569e651415a0958d6b3e6226ef2825c24"; + sha256 = "15hlv03x61fcs9qcb7m2h8wjh75bpsk6dlpv03l2iwak467qnk51"; + }; + }; "https://dl.google.com/dl/android/maven2/androidx/interpolator/interpolator/1.0.0/interpolator-1.0.0" = { host = repositories.google; @@ -650,6 +560,21 @@ in { sha256 = "1z7y6nsqdzv08x4dxbgcjfyj0pvhkgwmwpgkl5pymb84i0c7mbbv"; }; }; + "https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-common/2.1.0/lifecycle-common-2.1.0" = + { + host = repositories.google; + path = + "androidx/lifecycle/lifecycle-common/2.1.0/lifecycle-common-2.1.0"; + type = "jar"; + pom = { + sha1 = "de2b915adafa394edd5eadcab6b5089d08fb71f6"; + sha256 = "0xpjh83m6ikc9rqmhz0sbm9my9bg351qjvmviw6255bs8dh2lb39"; + }; + jar = { + sha1 = "c67e7807d9cd6c329b9d0218b2ec4e505dd340b7"; + sha256 = "0hr610gzh7k0hbd4fs3l4hl9bn965hmb3zn2c6rhywxx6gjnpnvn"; + }; + }; "https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-livedata-core/2.0.0/lifecycle-livedata-core-2.0.0" = { host = repositories.google; @@ -695,6 +620,21 @@ in { sha256 = "1yrwsjfskismgyq5n1vkqv9gz4m445hz876z1qz6ygqq6vkckbz4"; }; }; + "https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-runtime/2.1.0/lifecycle-runtime-2.1.0" = + { + host = repositories.google; + path = + "androidx/lifecycle/lifecycle-runtime/2.1.0/lifecycle-runtime-2.1.0"; + type = "aar"; + pom = { + sha1 = "87fefa0cd4644709a2afc1f2da09397694bfe8b1"; + sha256 = "1jwzjl6nwxnqpgmwmpx170ms6ybxygdyhsrxnpabqy9dvc1cz3dg"; + }; + jar = { + sha1 = "24af6c5162c83b5bf073e16608fd87821422fe48"; + sha256 = "0arir2aa3qqc74x24qw8slrgbls22ypxbnc33rjp1s35p6bkh5z5"; + }; + }; "https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmodel/2.0.0/lifecycle-viewmodel-2.0.0" = { host = repositories.google; @@ -710,6 +650,21 @@ in { sha256 = "0qn0pkzk70jh5j7w5rf3hy6xxgs3krz2k26g2jmq1bbb3gm0linn"; }; }; + "https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmodel/2.1.0/lifecycle-viewmodel-2.1.0" = + { + host = repositories.google; + path = + "androidx/lifecycle/lifecycle-viewmodel/2.1.0/lifecycle-viewmodel-2.1.0"; + type = "aar"; + pom = { + sha1 = "b95d38b7236e5bb4249d74fdab5044c292158342"; + sha256 = "1d54r4vs36ad9zcixdip1mpr575pqy2lqflp9kkjgqn377ip5ai9"; + }; + jar = { + sha1 = "682d06cc95e0632efdb9cfcc18828840ac941148"; + sha256 = "0gajp14n4s37m9n37vs39hmhp6ax13vsra6d4x9qv0mjq5xgnmds"; + }; + }; "https://dl.google.com/dl/android/maven2/androidx/loader/loader/1.0.0/loader-1.0.0" = { host = repositories.google; @@ -800,6 +755,21 @@ in { sha256 = "0j25mc0jfdgzw541icbvjns63aj29fd4ch1bkp52fh01mjqnz586"; }; }; + "https://dl.google.com/dl/android/maven2/androidx/savedstate/savedstate/1.0.0/savedstate-1.0.0" = + { + host = repositories.google; + path = + "androidx/savedstate/savedstate/1.0.0/savedstate-1.0.0"; + type = "aar"; + pom = { + sha1 = "3efaae1f3b3dc6c389a390ef716ede40ec63ef06"; + sha256 = "0z6yiwznp9wslahfxx9nh6nrrv48myfj4nampxw8qygazhi7skc4"; + }; + jar = { + sha1 = "6d39721808cd67e3d3d0d60f194907615fcaa69c"; + sha256 = "10rf82xya0cgizx20kpwwbzx0g1jmzx78id0w6f9qmrpkihsa415"; + }; + }; "https://dl.google.com/dl/android/maven2/androidx/slidingpanelayout/slidingpanelayout/1.0.0/slidingpanelayout-1.0.0" = { host = repositories.google; @@ -830,6 +800,51 @@ in { sha256 = "13bf0brs7wn9kd0xmjdmjl7fqvbm8p3bpi530vyr7c6916lb6qcp"; }; }; + "https://dl.google.com/dl/android/maven2/androidx/swiperefreshlayout/swiperefreshlayout/1.1.0-alpha02/swiperefreshlayout-1.1.0-alpha02" = + { + host = repositories.google; + path = + "androidx/swiperefreshlayout/swiperefreshlayout/1.1.0-alpha02/swiperefreshlayout-1.1.0-alpha02"; + type = "aar"; + pom = { + sha1 = "a46229bf11dbdf4d2952357d050b14b6d432c628"; + sha256 = "0aj4kch3rkx1s5bl6mmvwgvi214ldspgm4g4flx1kkqr46n1x0r8"; + }; + jar = { + sha1 = "5cb9e619bcf4b8d4c0fae0d8530abcaeee292110"; + 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; + path = + "androidx/transition/transition/1.1.0/transition-1.1.0"; + type = "aar"; + pom = { + sha1 = "0c354a924354ceed91673412fb5b6ce326735a63"; + sha256 = "0paa8lci1xhkd631ak7knk87fbxbxi255clphhb3dy9kqvla2k2x"; + }; + jar = { + sha1 = "ee403adc3ae340af6461cdd8151b4518c9f5c1b0"; + sha256 = "0y7kx238yghsrh06ywgw9xm9zaw0izjcgkmxjngnalc78by4r3mx"; + }; + }; "https://dl.google.com/dl/android/maven2/androidx/vectordrawable/vectordrawable-animated/1.0.0/vectordrawable-animated-1.0.0" = { host = repositories.google; @@ -845,6 +860,21 @@ in { sha256 = "1wbc4cnbbd4hgkmy6l97jpcm47a3gvrz400bb8ipv6ls1b7s1hr6"; }; }; + "https://dl.google.com/dl/android/maven2/androidx/vectordrawable/vectordrawable-animated/1.1.0/vectordrawable-animated-1.1.0" = + { + host = repositories.google; + path = + "androidx/vectordrawable/vectordrawable-animated/1.1.0/vectordrawable-animated-1.1.0"; + type = "aar"; + pom = { + sha1 = "2c40e16427f4e94ea471526868ba5ac4bd13de6d"; + sha256 = "1ga0l1hbl7l1f8j27yvm4frx6vvgqnb99vh3j1dvfpvhdc8j0si7"; + }; + jar = { + sha1 = "fcda1161354501471c30a4e077af6b5c4d4eddc6"; + sha256 = "1y034igcx1xf7qvg6n6hks08gnh0ilj2npnzaj0c7nbi4d82rnkn"; + }; + }; "https://dl.google.com/dl/android/maven2/androidx/vectordrawable/vectordrawable/1.0.1/vectordrawable-1.0.1" = { host = repositories.google; @@ -860,6 +890,21 @@ in { sha256 = "1ljyf6gymbz9hhcygrmz0va5bmn26ffirq48qcpya44mgfami8sc"; }; }; + "https://dl.google.com/dl/android/maven2/androidx/vectordrawable/vectordrawable/1.1.0/vectordrawable-1.1.0" = + { + host = repositories.google; + path = + "androidx/vectordrawable/vectordrawable/1.1.0/vectordrawable-1.1.0"; + type = "aar"; + pom = { + sha1 = "8b15e03d94f7d9a07cbea653ad7f524315d1d507"; + sha256 = "1cib94wwskg9haj7v9amvlfmwfs7bz723g2wg024irbr45djs3jv"; + }; + jar = { + sha1 = "eac7a364fff534035a2a6cb17770a1288315f69f"; + sha256 = "09lfvw1gn16avi726kbpd6d9x2ssih4vyqy2mgybfj8vq0x67za6"; + }; + }; "https://dl.google.com/dl/android/maven2/androidx/versionedparcelable/versionedparcelable/1.0.0/versionedparcelable-1.0.0" = { host = repositories.google; @@ -875,6 +920,21 @@ in { sha256 = "1qqw5vnqzyc45x3s3njf8bh1008bprq0l50frbfwq5l0xn9qlhzn"; }; }; + "https://dl.google.com/dl/android/maven2/androidx/versionedparcelable/versionedparcelable/1.1.0/versionedparcelable-1.1.0" = + { + host = repositories.google; + path = + "androidx/versionedparcelable/versionedparcelable/1.1.0/versionedparcelable-1.1.0"; + type = "aar"; + pom = { + sha1 = "5860ab66f74bffbfcfd51883ddabd477a0b80dc8"; + sha256 = "1dakq8yjjfxx8jd0h8csg4xx9nvrdrk61m19m2yj6qy01jzcfaf7"; + }; + jar = { + sha1 = "91acce73e00a17b524f6697f6c3893efb8ea349f"; + sha256 = "1h8hnymlblgxdbflcbgdhw4q1hcv2myywm2hdf3bf8n218a7f7cs"; + }; + }; "https://dl.google.com/dl/android/maven2/androidx/viewpager/viewpager/1.0.0/viewpager-1.0.0" = { host = repositories.google; @@ -2753,6 +2813,21 @@ in { sha256 = "01xqv2zdy2if0fm28l2kfj86dyj1adq977nvhy8v0kzscvxgv0d0"; }; }; + "https://dl.google.com/dl/android/maven2/com/google/android/material/material/1.0.0/material-1.0.0" = + { + host = repositories.google; + path = + "com/google/android/material/material/1.0.0/material-1.0.0"; + type = "aar"; + pom = { + sha1 = "2bcf783c3bc66bafc0e1c9ca721d7544659bb6c3"; + sha256 = "1aqm6mh1448hszv9agcq85wckpyiwjzhpi85wdfij48wsm0zbzy9"; + }; + jar = { + sha1 = "f83e012c22d2fac8fcf23880d7167832b099fa94"; + sha256 = "1p0sq4kgxybslqj8044fh056m9fqmp543r5jk7crhdy0lf0y703n"; + }; + }; "https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-common/16.0.3/firebase-common-16.0.3" = { host = repositories.google; @@ -7804,62 +7879,6 @@ in { sha256 = "16fyyvalj6al7hxgz7w2x27xzmaw0ldc2wiax0w23ry2gzg4gjwd"; }; }; - "https://repo.maven.apache.org/maven2/com/esotericsoftware/kryo/kryo/2.20/kryo-2.20" = - { - host = repositories.apache; - path = - "com/esotericsoftware/kryo/kryo/2.20/kryo-2.20"; - type = "jar"; - pom = { - sha1 = "db5822be831634cb9fc7d3ad60fc2d48e172a1a7"; - sha256 = "1crg1d2mqqj0m8ddgfwvqpl9vjbpn30baxwi7qymfqh1haxcjzla"; - }; - jar = { - sha1 = "b596abed147c5c5b985c996094c5c1d6622dcb9f"; - sha256 = "160ign6lynid1za6xwhi3v8f82q2jdb6snzzcw2hmn54v980ws56"; - }; - }; - "https://repo.maven.apache.org/maven2/com/esotericsoftware/minlog/minlog/1.2/minlog-1.2" = - { - host = repositories.apache; - path = - "com/esotericsoftware/minlog/minlog/1.2/minlog-1.2"; - type = "jar"; - pom = { - sha1 = "67d00f6a12cac438eb96f12fa4e3b32ba452b810"; - sha256 = "18kpysh9sc3cv7y0rdy3hxrpvnvcw27jcb1sxgyq3di96cma20dg"; - }; - jar = { - sha1 = "59bfcd171d82f9981a5e242b9e840191f650e209"; - sha256 = "1wk09rf32radx01aspfmqfdqmna131s7ab4r3j83vl7mm0dcny56"; - }; - }; - "https://repo.maven.apache.org/maven2/com/esotericsoftware/reflectasm/reflectasm/1.07/reflectasm-1.07" = - { - host = repositories.apache; - path = - "com/esotericsoftware/reflectasm/reflectasm/1.07/reflectasm-1.07"; - type = "jar"; - pom = { - sha1 = "c5da38373fa65bd2870ced97ba4d5ccc08be62de"; - sha256 = "0phw8hmf1x87v68g39rzjbr34ci80sh5sf7m1xkdl4vhyja4nx4a"; - }; - jar = { - sha1 = "761028ef46da8ec16a16b25ce942463eb1a9f3d5"; - sha256 = "09k06wnbsxchb9p9jv3fg4jgkzjs5l9xxfhah9bi0n7zar45b635"; - }; - }; - "https://repo.maven.apache.org/maven2/com/esotericsoftware/reflectasm/reflectasm/1.07/reflectasm-1.07-shaded" = - { - host = repositories.apache; - path = - "com/esotericsoftware/reflectasm/reflectasm/1.07/reflectasm-1.07-shaded"; - type = "jar"; - jar = { - sha1 = "76f11c94a53ee975a0d9154b325c408b210155bd"; - sha256 = "0xkwgs97pnyw2nm3d84s18dsa886azvw350izjpfsx5jnjnhx9q8"; - }; - }; "https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.3.0/jackson-annotations-2.3.0" = { host = repositories.apache; @@ -8403,32 +8422,6 @@ in { sha256 = "0a38gd0j67siikp3zabrdgfkk7afnzg30pz0yfkvqgyafdg397g0"; }; }; - "https://repo.maven.apache.org/maven2/com/google/guava/guava-jdk5/17.0/guava-jdk5-17.0" = - { - host = repositories.apache; - path = - "com/google/guava/guava-jdk5/17.0/guava-jdk5-17.0"; - type = "jar"; - pom = { - sha1 = "41f020642c6a9151ec18736d1fa01e6606c9be6f"; - sha256 = "0rnvlc2v46axw2wgy6g838is0jd6srpas5ycwz25pm0kg1i55hgq"; - }; - jar = { - sha1 = "463f8378feba44df7ba7cd9272d01837dad62b36"; - sha256 = "0qbc8lg1rqs75jin0afyw9s49qfkybvmdjv8v77a7pdn8xjlbgsr"; - }; - }; - "https://repo.maven.apache.org/maven2/com/google/guava/guava-parent-jdk5/17.0/guava-parent-jdk5-17.0" = - { - host = repositories.apache; - path = - "com/google/guava/guava-parent-jdk5/17.0/guava-parent-jdk5-17.0"; - type = "jar"; - pom = { - sha1 = "955dd912f3b5bd06e6db874b4d90de333745b0fe"; - sha256 = "0vzvn5h0yrnmis0f195ad108b1g7nglqgy0xq6rmcab34yy0d5js"; - }; - }; "https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/10.0.1/guava-parent-10.0.1" = { host = repositories.apache; @@ -10333,7 +10326,7 @@ in { "javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final"; type = "jar"; pom = { - sha1 = "0d2ad4d1498d1048abc6c6948fd3f835d8fdafb0"; + sha1 = ""; sha256 = "0772mrm8nw31xj6jg5hwgvy2hsbygn1y61mx615w3rnbwq8ljqxq"; }; jar = { @@ -24174,17 +24167,6 @@ in { sha256 = "06520i1ygx33iv11haz7l61m1xgzzhn4c72zjjyqdxirqkqprs7d"; }; }; - "https://repo.maven.apache.org/maven2/org/objenesis/objenesis-parent/1.2/objenesis-parent-1.2" = - { - host = repositories.apache; - path = - "org/objenesis/objenesis-parent/1.2/objenesis-parent-1.2"; - type = "jar"; - pom = { - sha1 = "033696ac4ff0beb9e5893567e054d8d8e5a0c825"; - sha256 = "01whfmi39n77njfrpzx30ylcbfq6r5zkxjyby4vfrrazzslqckn8"; - }; - }; "https://repo.maven.apache.org/maven2/org/objenesis/objenesis-parent/1.3/objenesis-parent-1.3" = { host = repositories.apache; @@ -24255,21 +24237,6 @@ in { sha256 = "1a4iyj3ri4arrbln3bajys08f7bb7jdijm7jha9lf9r5v5alnsf5"; }; }; - "https://repo.maven.apache.org/maven2/org/objenesis/objenesis/1.2/objenesis-1.2" = - { - host = repositories.apache; - path = - "org/objenesis/objenesis/1.2/objenesis-1.2"; - type = "jar"; - pom = { - sha1 = "9151e3c73d379b42f879b472bc5eec0b35b1eff8"; - sha256 = "0jmprfql0vpn2zf2ynfnwrdj72csm8i5bfshz70ih7f02l31nihx"; - }; - jar = { - sha1 = "bfcb0539a071a4c5a30690388903ac48c0667f2a"; - sha256 = "0w5s17ynrbwy5w65pv6pip5qspljlj9vvwpdd9ybhjc1awvw4rcc"; - }; - }; "https://repo.maven.apache.org/maven2/org/objenesis/objenesis/1.3/objenesis-1.3" = { host = repositories.apache; @@ -24506,17 +24473,6 @@ in { sha256 = "0cdr7hlzrlwcfr9r15wmphzxaiadc27s6gb58gvz3jrlxcsv86qw"; }; }; - "https://repo.maven.apache.org/maven2/org/ow2/asm/asm-parent/4.0/asm-parent-4.0" = - { - host = repositories.apache; - path = - "org/ow2/asm/asm-parent/4.0/asm-parent-4.0"; - type = "jar"; - pom = { - sha1 = "e7bed114eb05c1759de720bb50308ef2a97c5131"; - sha256 = "065cyifib7bjmq1cl4syg7qr4lxmkna0ma2abqf92z20xq5gwnj0"; - }; - }; "https://repo.maven.apache.org/maven2/org/ow2/asm/asm-parent/5.0.1/asm-parent-5.0.1" = { host = repositories.apache; @@ -24583,21 +24539,6 @@ in { sha256 = "053xrln1w9nj0aw23wsiqkgn8569fk6zx7mw8dns9jgcp55hc7br"; }; }; - "https://repo.maven.apache.org/maven2/org/ow2/asm/asm/4.0/asm-4.0" = - { - host = repositories.apache; - path = - "org/ow2/asm/asm/4.0/asm-4.0"; - type = "jar"; - pom = { - sha1 = "5e484ac83d98253bf04ce8653aa959e8f0331783"; - sha256 = "1mw6sx3nv9rz2wvb3g5irsj794zq35x8fn6x74nv2ilyhnpfyg76"; - }; - jar = { - sha1 = "659add6efc75a4715d738e73f07505246edf4d66"; - sha256 = "0mx9wb9b4z699hsh33zh7dwyzavk9sly179xqhjb0yx4428dwbgv"; - }; - }; "https://repo.maven.apache.org/maven2/org/ow2/asm/asm/5.0.2/asm-5.0.2" = { host = repositories.apache; @@ -24915,21 +24856,6 @@ in { sha256 = "0zima9a1p07dw2yd362y701qyd063rl6n2dbfq8yw57p62890yrn"; }; }; - "https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.10/slf4j-api-1.7.10" = - { - host = repositories.apache; - path = - "org/slf4j/slf4j-api/1.7.10/slf4j-api-1.7.10"; - type = "jar"; - pom = { - sha1 = "e5247e58569e3386a67622e01fcbf189ea902cbf"; - sha256 = "1c8ldjj2nvyd22xlrdainh1bs90srjrr3p9dg5s2qhk34a6mx75g"; - }; - jar = { - sha1 = "5b338f206827d88acd890739f400a9b7664e5984"; - sha256 = "1zib4f8lj0787di7v2j04ad5w4gaxw9v31xzi494s3bl0mqf4qrq"; - }; - }; "https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.19/slf4j-api-1.7.19" = { host = repositories.apache; @@ -25027,17 +24953,6 @@ in { sha256 = "11fc0rb40w1s7v2b13gx70njzbiwmrz5bkik9y40698a5x9n583n"; }; }; - "https://repo.maven.apache.org/maven2/org/slf4j/slf4j-parent/1.7.10/slf4j-parent-1.7.10" = - { - host = repositories.apache; - path = - "org/slf4j/slf4j-parent/1.7.10/slf4j-parent-1.7.10"; - type = "jar"; - pom = { - sha1 = "ed97ed5a64d2851ed1709f94f66fc553d52e310a"; - sha256 = "1kp2jy8qp7pxl5ysryblngb8w963z256ar7v4r4rpdrg33sygghs"; - }; - }; "https://repo.maven.apache.org/maven2/org/slf4j/slf4j-parent/1.7.19/slf4j-parent-1.7.19" = { host = repositories.apache; diff --git a/project.clj b/project.clj index 8258c16e49a..bd05d1bf775 100644 --- a/project.clj +++ b/project.clj @@ -1,7 +1,10 @@ (defproject status-im "0.1.0-SNAPSHOT" :url "https://github.com/status-im/status-react/" + :local-repo "/tmp/tmp-status-react-31ec97143/tmp.odmqQnegUI" :license {:name "Eclipse Public License" :url "http://www.eclipse.org/legal/epl-v10.html"} + ;; NOTE: Dependecies here are used in CI, till the CI script will be updated + ;; all deps should be maintained in deps.edn and here. :dependencies [[org.clojure/clojure "1.10.0"] [org.clojure/clojurescript "1.10.520" :exclusions @@ -19,6 +22,7 @@ [com.taoensso/encore "2.94.0"] [hickory "0.7.1"] [cljs-bean "1.3.0"] + [binaryage/oops "0.7.0"] [mvxcvi/alphabase "1.0.0"]] :plugins [[rasom/lein-githooks "0.1.5"] [lein-cljsbuild "1.1.7"] diff --git a/src/status_im/android/core.cljs b/src/status_im/android/core.cljs index 0617d01441b..dc7519f993b 100644 --- a/src/status_im/android/core.cljs +++ b/src/status_im/android/core.cljs @@ -1,6 +1,7 @@ (ns status-im.android.core (:require [reagent.core :as reagent] [re-frame.core :refer [subscribe dispatch dispatch-sync]] + [oops.core :refer [ocall]] status-im.utils.db status-im.ui.screens.db status-im.ui.screens.events @@ -41,8 +42,7 @@ (when-not (zero? @keyboard-height) (dispatch [:set :keyboard-height 0])))) (.hide react/splash-screen) - ;; TODO Temporarily comment away due to current bug https://github.com/kmagiera/react-native-screens/issues/54 - ;(.useScreens rn-dependencies/react-native-screens) + (ocall rn-dependencies/react-native-screens "enableScreens") (.addEventListener react/app-state "change" app-state-change-handler) (.addEventListener rn-dependencies/react-native-languages "change" on-languages-change) (.addEventListener rn-dependencies/react-native-shake @@ -57,6 +57,6 @@ :reagent-render views/main}))) (defn init [] - (status/set-soft-input-mode status/adjust-resize) + (status/set-soft-input-mode 16) (core/init app-root) (snoopy/subscribe!)) diff --git a/src/status_im/cljs_react_navigation/base.cljs b/src/status_im/cljs_react_navigation/base.cljs index 9c74da46da9..6084949a94f 100644 --- a/src/status_im/cljs_react_navigation/base.cljs +++ b/src/status_im/cljs_react_navigation/base.cljs @@ -14,25 +14,18 @@ ;; Core (defonce createAppContainer (oget ReactNavigation ["createAppContainer"])) -(defonce StateUtils (oget ReactNavigation ["StateUtils"])) - (defonce NavigationEvents (oget ReactNavigation ["NavigationEvents"])) (defonce NavigationActions (oget ReactNavigation ["NavigationActions"])) (defonce StackActions (oget ReactNavigation ["StackActions"])) ;; Navigators -(defonce createNavigator (oget ReactNavigation ["createNavigator"])) (defonce createStackNavigator (oget ReactNavigationStack ["createStackNavigator"])) (defonce createSwitchNavigator (oget ReactNavigation ["createSwitchNavigator"])) (defonce createBottomTabNavigator (oget ReactNavigationTabs ["createBottomTabNavigator"])) (defonce createTwoPaneNavigator (oget TwoPaneNavigator ["createTwoPaneNavigator"])) ;; Views -(defonce StackView (oget ReactNavigationStack ["StackView"])) -(defonce HeaderView (oget ReactNavigationStack ["Header"])) -(defonce SwitchView (oget ReactNavigation ["SwitchView"])) - (assert (and React ReactNavigation ReactNavigationTabs ReactNavigationStack TwoPaneNavigator) "React, React Navigation and peer dependencies must be installed.") @@ -77,13 +70,6 @@ :react-navigation/navigationOptions])) (s/def :react-navigation/RouteConfigs (s/map-of keyword? :react-navigation.RouteConfigs/route)) -(defn append-navigationOptions - "If navigationOptions are specified append to the react-component" - [react-component navigationOptions] - (when (and navigationOptions (not= navigationOptions :cljs.spec.alpha/invalid)) - (aset react-component "navigationOptions" (clj->js navigationOptions))) - react-component) - (s/fdef append-navigationOptions :args (s/tuple :react/component :react-navigation/navigationOptions) :ret #(ric/react-class? %)) diff --git a/src/status_im/cljs_react_navigation/reagent.cljs b/src/status_im/cljs_react_navigation/reagent.cljs index ebbe3042daa..dffe4c013b7 100644 --- a/src/status_im/cljs_react_navigation/reagent.cljs +++ b/src/status_im/cljs_react_navigation/reagent.cljs @@ -61,10 +61,6 @@ ;; Spec overrides for Reagent Components (s/def :react/component (s/conformer react-component?)) (s/def :react/element (s/conformer react-element?)) -(s/def :react-navigation.navigationOptions/headerTitle (s/conformer string-or-react-element?)) -(s/def :react-navigation.navigationOptions/headerLeft (s/conformer string-or-react-element?)) -(s/def :react-navigation.navigationOptions/headerRight (s/conformer string-or-react-element?)) -(s/def :react-navigation.navigationOptions/tabBarIcon (s/conformer fn-or-react-element?)) (s/def :react-navigation.RouteConfigs.route/screen (s/conformer fn-or-react-component?)) ;; API diff --git a/src/status_im/hardwallet/core.cljs b/src/status_im/hardwallet/core.cljs index 10e0fc58a83..d9347dd63d7 100644 --- a/src/status_im/hardwallet/core.cljs +++ b/src/status_im/hardwallet/core.cljs @@ -147,6 +147,7 @@ (fx/defn enter-pin-navigate-back-button-clicked [{:keys [db] :as cofx}] + ;; TODO: Get rid of navigation-stack (let [screen-before (set (take 4 (:navigation-stack db))) navigate-to-browser? (contains? screen-before :browser-stack)] (if navigate-to-browser? @@ -745,6 +746,7 @@ cofx (clear-on-card-connected) (clear-on-card-read) + ;; TODO: Get rid of navigation stack (if (contains? (set (take 3 (:navigation-stack db))) :keycard-login-pin) (navigation/navigate-to-cofx :multiaccounts nil) diff --git a/src/status_im/multiaccounts/login/core.cljs b/src/status_im/multiaccounts/login/core.cljs index 77f8cc46bec..f6695f19795 100644 --- a/src/status_im/multiaccounts/login/core.cljs +++ b/src/status_im/multiaccounts/login/core.cljs @@ -314,6 +314,7 @@ (fx/defn open-keycard-login [{:keys [db] :as cofx}] + ;; TODO: Get rid of navigation-stack (let [navigation-stack (:navigation-stack db)] (fx/merge cofx {:db (-> db diff --git a/src/status_im/subs.cljs b/src/status_im/subs.cljs index a4c62bde61d..83a19bc29c2 100644 --- a/src/status_im/subs.cljs +++ b/src/status_im/subs.cljs @@ -60,7 +60,6 @@ ;;view (reg-root-key-sub :view-id :view-id) -(reg-root-key-sub :navigation-stack :navigation-stack) (reg-root-key-sub :screen-params :navigation/screen-params) (reg-root-key-sub :two-pane-ui-enabled? :two-pane-ui-enabled?) @@ -361,11 +360,11 @@ (fn [[params view-id-db] [_ view-id]] (get params (or view-id view-id-db)))) +;; FIXME (re-frame/reg-sub :can-navigate-back? - :<- [:navigation-stack] - (fn [stack] - (> (count stack) 1))) + (fn [_] + true)) (re-frame/reg-sub :delete-swipe-position @@ -441,8 +440,6 @@ (fn [chain-keyword] (tokens/native-currency chain-keyword))) -(reg-root-key-sub :ethereum/current-block :ethereum/current-block) - ;;MULTIACCOUNT ============================================================================================================== (re-frame/reg-sub diff --git a/src/status_im/ui/components/tabbar/core.cljs b/src/status_im/ui/components/tabbar/core.cljs index 9c84e1bf28c..bd7f6aa8222 100644 --- a/src/status_im/ui/components/tabbar/core.cljs +++ b/src/status_im/ui/components/tabbar/core.cljs @@ -3,15 +3,16 @@ [status-im.ui.components.animation :as animation] [status-im.ui.components.tabbar.styles :as tabs.styles] [reagent.core :as reagent] + [oops.core :refer [oget]] + [cljs-bean.core :refer [bean]] [status-im.ui.components.react :as react] [status-im.utils.platform :as platform] [status-im.ui.components.icons.vector-icons :as vector-icons] - [status-im.ui.components.common.common :as components.common] [status-im.ui.components.badge :as badge] [status-im.i18n :as i18n] [re-frame.core :as re-frame])) -(defonce visible? (animation/create-value 1)) +(defonce visible? (animation/create-value 0)) (defonce last-to-value (atom 1)) (defn animate @@ -28,6 +29,31 @@ :useNativeDriver true}) callback)))) +(defn main-tab? [view-id] + (contains? + #{:home :wallet :open-dapp :my-profile :wallet-onboarding-setup} + view-id)) + +(defn minimize-bar [minimized-state routes index] + (let [tab-stack (aget routes index) + index (oget tab-stack "index") + route (aget (oget tab-stack "routes") index) + route-name (keyword (oget route "routeName"))] + (if (main-tab? route-name) + (do + (reset! minimized-state false) + (animate visible? 150 0)) + (do + (reset! minimized-state true) + (animate visible? 150 1))))) + +(defn- inverted-routes [routes] + (reduce (fn [acc [i el]] + (assoc acc (keyword (oget el "key")) + #js {:index (name i) :route el})) + {} + (bean routes))) + (def tabs-list-data (->> [{:nav-stack :chat-stack @@ -52,146 +78,63 @@ :accessibility-label :profile-tab-button}] (remove nil?))) -(defn new-tab - [{:keys [icon label active? nav-stack - accessibility-label count-subscription]}] - (let [count (when count-subscription - (re-frame/subscribe [count-subscription]))] - [react/touchable-highlight - {:style tabs.styles/touchable-container - :disabled active? - :on-press #(re-frame/dispatch-sync [:navigate-to nav-stack]) - :accessibility-label accessibility-label} - [react/view - {:style tabs.styles/new-tab-container} - [react/view - {:style tabs.styles/icon-container} - [vector-icons/icon icon (tabs.styles/icon active?)] - (when (pos? (if count @count 0)) - [react/view {:style (if (= nav-stack :chat-stack) - tabs.styles/message-counter - tabs.styles/counter)} - [badge/message-counter @count true]])] - (when-not platform/desktop? - [react/view {:style tabs.styles/tab-title-container} - [react/text {:style (tabs.styles/new-tab-title active?)} - label]])]])) - -(defn tabs [current-view-id] - [react/view - {:style tabs.styles/new-tabs-container} - [react/view {:style tabs.styles/tabs} - (for [{:keys [nav-stack accessibility-label count-subscription] - {:keys [icon title]} :content} tabs-list-data] - ^{:key nav-stack} - [new-tab - {:icon icon - :label title - :accessibility-label accessibility-label - :count-subscription count-subscription - :active? (= current-view-id nav-stack) - :nav-stack nav-stack}])]]) - -(defn main-tab? [view-id] - (contains? - #{:home :wallet :open-dapp :my-profile :wallet-onboarding-setup} - view-id)) - -(defn minimize-bar [view-id] - (if (main-tab? view-id) - (animate visible? 150 1) - (animate visible? 150 tabs.styles/minimized-tab-ratio))) - -(defn tabs-animation-wrapper-ios - [content] - [react/view {:style tabs.styles/title-cover-wrapper-ios} - [react/view - content - (when platform/iphone-x? - [react/view - {:style tabs.styles/ios-titles-cover}])]]) +(defn tab [] + (fn [{:keys [icon label active? nav-stack on-press + accessibility-label count-subscription]}] + (let [count (when count-subscription @(re-frame/subscribe [count-subscription]))] + [react/touchable-highlight {:style tabs.styles/touchable-container + :disabled active? + :on-press on-press + :accessibility-label accessibility-label} + [react/view {:style tabs.styles/tab-container} + [react/view {:style tabs.styles/icon-container} + [vector-icons/icon icon (tabs.styles/icon active?)] + (when (pos? count) + [react/view {:style (if (= nav-stack :chat-stack) + tabs.styles/message-counter + tabs.styles/counter)} + [badge/message-counter count true]])] -(defn tabs-animation-wrapper-android - [keyboard-shown? view-id content] - [react/view - {:style (tabs.styles/animation-wrapper - keyboard-shown? - (main-tab? view-id))} - [react/view - {:style tabs.styles/title-cover-wrapper-android} - content]]) + (when-not platform/desktop? + [react/view {:style tabs.styles/tab-title-container} + [react/text {:style (tabs.styles/tab-title active?)} + label]])]]))) -(defn tabs-animation-wrapper [keyboard-shown? view-id tab] - (reagent.core/create-class - {:component-will-update - (fn [this new-params] - (let [old-view-id (get (.-argv (.-props this)) 2) - new-view-id (get new-params 2)] - (when (not= new-view-id old-view-id) - (minimize-bar new-view-id)))) - :reagent-render - (fn [keyboard-shown? view-id tab] - (when-not (contains? #{:enter-pin-login - :enter-pin-sign - :enter-pin-settings} view-id) - (case platform/os - "ios" [tabs-animation-wrapper-ios - [react/animated-view - {:style (tabs.styles/animated-container visible? keyboard-shown?)} - [tabs tab]]] - "android" [tabs-animation-wrapper-android - keyboard-shown? - view-id - [react/animated-view - {:style (tabs.styles/animated-container visible? keyboard-shown?)} - [tabs tab]]] - "desktop" - [tabs-animation-wrapper-android - keyboard-shown? - view-id - [react/animated-view - {:style (tabs.styles/animated-container visible? keyboard-shown?)} - [tabs tab]]])))})) +(defn tabs [] + (let [minimized-state (reagent/atom nil)] + (fn [{:keys [on-tab-press routes index inset]}] + (minimize-bar minimized-state routes index) -(def disappearance-duration 150) -(def appearance-duration 100) + (let [routes-map (inverted-routes routes)] + [react/view {:style (tabs.styles/tabs-wrapper inset)} + [react/animated-view {:style (tabs.styles/animated-container @minimized-state visible?)} + [react/view + {:style tabs.styles/tabs-container} + [react/view {:style tabs.styles/tabs} + (for [{:keys [nav-stack accessibility-label count-subscription] + {:keys [icon title]} :content} tabs-list-data] + ^{:key nav-stack} + [tab + {:icon icon + :label title + :on-press #(on-tab-press (get routes-map nav-stack)) + :accessibility-label accessibility-label + :count-subscription count-subscription + :active? (= (str index) + (oget (get routes-map nav-stack) "index")) + :nav-stack nav-stack}])]]] + [react/view + {:style (tabs.styles/ios-titles-cover inset)}]])))) -(defn tabbar [_ view-id] - (let [keyboard-shown? (reagent/atom false) - listeners (atom [])] - (reagent/create-class - {:component-did-mount - (fn [] - (when platform/android? - (reset! - listeners - [(.addListener react/keyboard "keyboardDidShow" - (fn [] - (reset! keyboard-shown? true) - (animate visible? - disappearance-duration 0))) - (.addListener react/keyboard "keyboardDidHide" - (fn [] - (reset! keyboard-shown? false) - (animate visible? appearance-duration - (if (main-tab? @view-id) - 1 - tabs.styles/minimized-tab-ratio))))]))) - :component-will-unmount - (fn [] - (when (not-empty @listeners) - (doseq [listener @listeners] - (when listener - (.remove listener))))) - :reagent-render - (fn [args view-id] - (let [idx (.. (:navigation args) - -state - -index) - tab (case idx - 0 :chat-stack - 1 :browser-stack - 2 :wallet-stack - 3 :profile-stack - :chat-stack)] - [tabs-animation-wrapper @keyboard-shown? @view-id tab]))}))) +(defn tabbar [props] + (let [on-tab-press (oget props "onTabPress") + routes (oget props "navigation" "state" "routes") + index (oget props "navigation" "state" "index")] + (reagent/as-element + [react/safe-area-consumer + (fn [insets] + (reagent/as-element + [tabs {:on-tab-press on-tab-press + :routes routes + :index index + :inset (oget insets "bottom")}]))]))) diff --git a/src/status_im/ui/components/tabbar/styles.cljs b/src/status_im/ui/components/tabbar/styles.cljs index 81dcb78640d..3c22b1eccb8 100644 --- a/src/status_im/ui/components/tabbar/styles.cljs +++ b/src/status_im/ui/components/tabbar/styles.cljs @@ -7,7 +7,7 @@ (def tabs-height (cond platform/android? 52 - platform/ios? 52 + platform/ios? 52 platform/desktop? 36)) (def minimized-tabs-height 36) @@ -17,30 +17,6 @@ (def minimized-tab-ratio (/ minimized-tabs-height tabs-height)) -(def tab-height (dec tabs-height)) - -(def tabs-container - {:flex-direction :row - :height tabs-height - :background-color colors/white - :border-top-width 1 - :border-top-color colors/black-transparent}) - -(def tab-container - {:height tabs-height - :justify-content :center - :align-items :center}) - -(styles/defn tab-title [active?] - {:ios {:font-size 11} - :android {:font-size 11} - :desktop {:font-size 12 - :font-weight (if active? "600" "400")} - :text-align :center - :color (if active? - colors/blue - colors/gray)}) - (def counter {:right 0 :top 0 @@ -59,7 +35,7 @@ {:flex 1 :height tabs-height}) -(def new-tab-container +(def tab-container {:flex 1 :height tabs-height :align-items :center @@ -84,12 +60,12 @@ :align-items :center :justify-content :center}) -(defn new-tab-title [active?] +(defn tab-title [active?] {:color (if active? colors/blue colors/gray) :font-size 11}) -(styles/def new-tabs-container - {:height tabs-height +(styles/def tabs-container + {:height minimized-tabs-height :align-self :stretch :ios {:background-color :white :shadow-radius 4 @@ -103,53 +79,31 @@ :shadow-color "rgba(0, 9, 26, 0.12)"}}) (def tabs - {:height tabs-height - :align-self :stretch - :padding-left 8 - :padding-right 8 - :flex-direction :row}) + {:align-self :stretch + :padding-horizontal 8 + :flex-direction :row}) -(defn animated-container [visible? keyboard-shown?] +(defn animated-container [minimized visible?] {:bottom 0 :left 0 :right 0 - :background-color :white :elevation 8 - :position (when (or platform/ios? - keyboard-shown?) - :absolute) + :background-color :white + :padding-top (if minimized 0 tabs-diff) :transform [{:translateY - (animation/interpolate - visible? - {:inputRange [0 1] - :outputRange [tabs-height 0]})}]}) + (animation/interpolate visible? + {:inputRange [0 1] + :outputRange [(- tabs-diff) 0]})}]}) -(def ios-titles-cover +(defn ios-titles-cover [inset] {:background-color :white :position :absolute - :height (- tabs-height minimized-tabs-height) + :height tabs-diff :align-self :stretch - :top 0 + :bottom (- inset tabs-diff) :right 0 :left 0}) -(def title-cover-wrapper-ios - {:left 0 - :right 0 - :bottom 0 - :padding-bottom (if platform/iphone-x? 34 0) - :position :absolute +(defn tabs-wrapper [inset] + {:padding-bottom inset :background-color :white}) - -(def title-cover-wrapper-android - {:left 0 - :right 0 - :bottom 0 - :position :absolute}) - -(defn animation-wrapper [keyboard-shown? main-tab?] - {:height (cond - keyboard-shown? 0 - main-tab? tabs-height - :else minimized-tabs-height) - :align-self :stretch}) diff --git a/src/status_im/ui/components/topbar.cljs b/src/status_im/ui/components/topbar.cljs index 24956ad23a4..ab80fb8d849 100644 --- a/src/status_im/ui/components/topbar.cljs +++ b/src/status_im/ui/components/topbar.cljs @@ -53,4 +53,4 @@ [react/view {:position :absolute :left @title-padding :right @title-padding :top 0 :bottom 0 :align-items :center :justify-content :center} [react/text {:style {:typography :title-bold :text-align :center} :number-of-lines 2} - (utils.label/stringify title)]])])))) \ No newline at end of file + (utils.label/stringify title)]])])))) diff --git a/src/status_im/ui/screens/db.cljs b/src/status_im/ui/screens/db.cljs index 274501de47a..00bd1633b09 100644 --- a/src/status_im/ui/screens/db.cljs +++ b/src/status_im/ui/screens/db.cljs @@ -19,7 +19,6 @@ ;; initial state of app-db (def app-db {:keyboard-height 0 - :navigation-stack '(:multiaccounts) :contacts/contacts {} :pairing/installations {} :qr-codes {} @@ -62,7 +61,6 @@ ;;;;GLOBAL -(spec/def ::was-modal? (spec/nilable boolean?)) ;;"http://localhost:8545" (spec/def ::rpc-url (spec/nilable string?)) ;;object? doesn't work @@ -92,12 +90,6 @@ ;;current view (spec/def :navigation/view-id (spec/nilable keyword?)) -;;modal view id -(spec/def :navigation/modal (spec/nilable keyword?)) -;;stack of view's ids (keywords) -(spec/def :navigation/navigation-stack (spec/nilable seq?)) -(spec/def :navigation/prev-tab-view-id (spec/nilable keyword?)) -(spec/def :navigation/prev-view-id (spec/nilable keyword?)) ;; navigation screen params (spec/def :navigation.screen-params/network-details (spec/keys :req [:networks/selected-network])) (spec/def :navigation.screen-params/browser (spec/nilable map?)) @@ -256,7 +248,6 @@ :popover/popover :wallet/sign-phrase-showed?] :opt-un [::modal - ::was-modal? ::rpc-url ::tooltips ::initial-props @@ -280,9 +271,6 @@ ::auth-method :multiaccount/multiaccount :navigation/view-id - :navigation/navigation-stack - :navigation/prev-tab-view-id - :navigation/prev-view-id :chat/chats :chat/current-chat-id :chat/chat-id diff --git a/src/status_im/ui/screens/navigation.cljs b/src/status_im/ui/screens/navigation.cljs index f5dfad73ec4..e27ef9a85c3 100644 --- a/src/status_im/ui/screens/navigation.cljs +++ b/src/status_im/ui/screens/navigation.cljs @@ -15,35 +15,20 @@ (defmethod preload-data! :default [db _] db) -(defn- -preload-data! [{:keys [was-modal?] :as db} & args] - (if was-modal? - (dissoc db :was-modal?) - (apply preload-data! db args))) - (fx/defn navigate-to-cofx [{:keys [db]} go-to-view-id screen-params] - (let [view-id (:view-id db) - db (cond-> (assoc db :view-id go-to-view-id) + (let [db (cond-> (assoc db :view-id go-to-view-id) + + ;; TODO: Inspect the need of screen-params (seq screen-params) (assoc-in [:navigation/screen-params go-to-view-id] screen-params))] - {:db (if (= view-id go-to-view-id) - db - (-> db - (update :navigation-stack conj go-to-view-id) - (assoc :view-id go-to-view-id))) + {:db db ::navigate-to [go-to-view-id screen-params]})) (fx/defn navigate-reset - [{:keys [db]} {:keys [index actions] :as config}] - (let [stack (into '() (map :routeName actions)) - view-id (get stack index)] - {:db (assoc db - :view-id view-id - ;;NOTE: stricly needs to be a list - ;;because navigate-back pops it - :navigation-stack stack) - ::navigate-reset config})) + [_ config] + {::navigate-reset config}) (def unload-data-interceptor (re-frame/->interceptor @@ -80,26 +65,13 @@ (fn [cofx [_ & [go-to-view-id screen-params]]] (navigate-to-cofx cofx go-to-view-id screen-params))) -(handlers/register-handler-fx - :navigate-to-modal - navigation-interceptors - (fn [{:keys [db]} [_ modal-view]] - {:db (assoc db :modal modal-view)})) - (fx/defn navigate-back - [{{:keys [navigation-stack view-id] :as db} :db}] - {::navigate-back nil - :db (let [[previous-view-id :as navigation-stack'] (pop navigation-stack) - first-in-stack (first navigation-stack)] - (if (= view-id first-in-stack) - (-> db - (assoc :view-id previous-view-id) - (assoc :navigation-stack navigation-stack')) - (assoc db :view-id first-in-stack)))}) + [_] + {::navigate-back nil}) (handlers/register-handler-fx :navigate-back - (re-frame/enrich -preload-data!) + (re-frame/enrich preload-data!) (fn [cofx _] (navigate-back cofx))) @@ -113,13 +85,3 @@ :navigate-to-clean (fn [cofx [_ view-id params]] (navigate-to-cofx cofx view-id params))) - -(handlers/register-handler-fx - :navigate-to-tab - navigation-interceptors - (fn [{:keys [db] :as cofx} [_ view-id]] - (fx/merge cofx - {:db (-> db - (assoc :prev-tab-view-id (:view-id db)) - (assoc :prev-view-id (:view-id db)))} - (navigate-to-cofx view-id {})))) diff --git a/src/status_im/ui/screens/pairing/views.cljs b/src/status_im/ui/screens/pairing/views.cljs index 7ea4901991f..f6d47d30ef4 100644 --- a/src/status_im/ui/screens/pairing/views.cljs +++ b/src/status_im/ui/screens/pairing/views.cljs @@ -52,7 +52,8 @@ (defn footer [syncing] [react/touchable-highlight {:on-press (when-not @syncing synchronize-installations!) - :style main-tabs.styles/tabs-container} + ;; TODO: Inspect the need of coupling with tabbar here + :style main-tabs.styles/tabs-container} [react/view {:style styles/footer-content} [react/text diff --git a/src/status_im/ui/screens/profile/user/views.cljs b/src/status_im/ui/screens/profile/user/views.cljs index 8d1e838391e..f6131beebb5 100644 --- a/src/status_im/ui/screens/profile/user/views.cljs +++ b/src/status_im/ui/screens/profile/user/views.cljs @@ -12,7 +12,6 @@ [status-im.ui.components.list.views :as list.views] [status-im.ui.components.qr-code-viewer.views :as qr-code-viewer] [status-im.ui.components.react :as react] - [status-im.ui.components.tabbar.styles :as tabs.styles] [status-im.ui.components.toolbar.view :as toolbar] [status-im.ui.screens.chat.photos :as photos] [status-im.ui.screens.profile.components.views :as profile.components] @@ -210,17 +209,15 @@ anim-opacity])) (defn content-with-header [list-ref scroll-y] - (let [{:keys [public-key - preferred-name + (let [{:keys [preferred-name mnemonic keycard-pairing - address notifications-enabled?] - :as multiaccount} @(re-frame/subscribe [:multiaccount]) + :as multiaccount} @(re-frame/subscribe [:multiaccount]) active-contacts-count @(re-frame/subscribe [:contacts/active-count]) - tribute-to-talk @(re-frame/subscribe [:tribute-to-talk/profile]) - registrar @(re-frame/subscribe [:ens.stateofus/registrar]) - photo-added? @(re-frame/subscribe [:profile/photo-added?])] + tribute-to-talk @(re-frame/subscribe [:tribute-to-talk/profile]) + registrar @(re-frame/subscribe [:ens.stateofus/registrar]) + photo-added? @(re-frame/subscribe [:profile/photo-added?])] [large-toolbar/flat-list-with-header-handler (header multiaccount photo-added?) (flat-list-content @@ -231,15 +228,11 @@ scroll-y])) (defn my-profile [] - (let [list-ref (reagent/atom nil) + (let [list-ref (reagent/atom nil) anim-opacity (animation/create-value 0) - scroll-y (animation/create-value 0)] + scroll-y (animation/create-value 0)] (large-toolbar/add-listener anim-opacity scroll-y) (fn [] - [react/view - {:style - (merge {:flex 1} - (when platform/ios? - {:margin-bottom tabs.styles/tabs-diff}))} + [react/view {:style {:flex 1}} [minimized-toolbar-handler anim-opacity] [content-with-header list-ref scroll-y]]))) diff --git a/src/status_im/ui/screens/progress/styles.cljs b/src/status_im/ui/screens/progress/styles.cljs index 20bcd088f07..8fca5f43155 100644 --- a/src/status_im/ui/screens/progress/styles.cljs +++ b/src/status_im/ui/screens/progress/styles.cljs @@ -1,6 +1,5 @@ (ns status-im.ui.screens.progress.styles - (:require [status-im.ui.components.colors :as colors] - [status-im.ui.components.toolbar.styles :as toolbar.styles])) + (:require [status-im.ui.components.colors :as colors])) (def container {:flex 1 diff --git a/src/status_im/ui/screens/progress/views.cljs b/src/status_im/ui/screens/progress/views.cljs index 75c362021bb..93de157b057 100644 --- a/src/status_im/ui/screens/progress/views.cljs +++ b/src/status_im/ui/screens/progress/views.cljs @@ -1,10 +1,8 @@ (ns status-im.ui.screens.progress.views - (:require-macros [status-im.utils.views :refer [defview letsubs]]) (:require [status-im.ui.screens.progress.styles :as styles] - [status-im.ui.components.react :as react] - [status-im.ui.components.react :as components])) + [status-im.ui.components.react :as react])) ;; a simple view with animated progress indicator in its center -(defview progress [_] +(defn progress [] [react/keyboard-avoiding-view {:style styles/container} - [components/activity-indicator {:animating true}]]) + [react/activity-indicator {:animating true}]]) diff --git a/src/status_im/ui/screens/routing/core.cljs b/src/status_im/ui/screens/routing/core.cljs index 755d5e92d0a..8db16a45ac8 100644 --- a/src/status_im/ui/screens/routing/core.cljs +++ b/src/status_im/ui/screens/routing/core.cljs @@ -3,10 +3,10 @@ [reagent.core :as reagent] [status-im.ui.components.react :as react] [status-im.ui.screens.routing.back-actions :as back-actions] - [status-im.ui.components.styles :as common-styles] [status-im.cljs-react-navigation.reagent :as nav-reagent] [re-frame.core :as re-frame] [taoensso.timbre :as log] + [oops.core :refer [oget]] [status-im.utils.platform :as platform] [status-im.utils.core :as utils] [status-im.ui.screens.routing.screens :as screens] @@ -18,20 +18,20 @@ [status-im.ui.screens.routing.modals :as modals] [status-im.ui.components.tabbar.core :as tabbar] [status-im.ui.components.status-bar.view :as status-bar] + [status-im.ui.screens.progress.views :as progress] [status-im.react-native.js-dependencies :as js-dependencies])) (defonce view-id (reagent/atom nil)) (defonce back-button-listener (atom nil)) -(defn navigation-events [current-view-id modal?] +;; TODO: Handle status bar for qr-code +(defn navigation-events [current-view-id] [:> nav-reagent/navigation-events {:on-will-focus (fn [] (when (not= @view-id current-view-id) (reset! view-id current-view-id)) (log/debug :on-will-focus current-view-id) - (when modal? - (status-bar/set-status-bar current-view-id)) (re-frame/dispatch [:screens/on-will-focus current-view-id])) :on-did-focus (fn [] @@ -41,9 +41,7 @@ (.addEventListener js-dependencies/back-handler "hardwareBackPress" - #(not (get back-actions/back-actions current-view-id)))) - (when-not modal? - (status-bar/set-status-bar current-view-id))) + #(not (get back-actions/back-actions current-view-id))))) :on-will-blur (fn [] (log/debug :on-will-blur current-view-id) @@ -58,21 +56,15 @@ (fn [args] (let [params (get-in args [:navigation :state :params]) screen-focused? (= screen-view-id @view-id)] - [react/safe-area-view {:style {:background-color :white - :flex 1}} - [navigation-events screen-view-id false] - [component params screen-focused?]]))) - -(defn wrap-modal - "Wraps modal screen with necessary styling and and adds navigation-events component" - [modal-view component] - (fn [args] - (let [params (get-in args [:navigation :state :params]) - active? (= modal-view @view-id)] - [react/safe-area-view {:style {:background-color :white - :flex 1}} - [component params active?] - [navigation-events modal-view true]]))) + ;; TODO: Safe area context adds always the safe area space, not only when needed + [react/safe-area-consumer + (fn [insets] + (reagent/as-element + [react/view {:style {:background-color :white + :padding-top (oget insets "top") + :flex 1}} + [navigation-events screen-view-id] + [component params screen-focused?]]))]))) (defn prepare-config [config] (-> config @@ -89,24 +81,7 @@ (defn stack-navigator [routes config] (let [res (nav-reagent/stack-navigator routes - (merge {:headerMode "none" - #_:transitionConfig - #_(fn [] - #js {:transitionSpec #js{:duration 10}}) - ;; :onTransitionStart (fn [n] - ;; (let [idx (.. n - ;; -navigation - ;; -state - ;; -index) - ;; routes (.. n - ;; -navigation - ;; -state - ;; -routes)] - ;; (when (and (array? routes) (int? idx)) - ;; (let [route (aget routes idx) - ;; route-name (keyword (.-routeName route))] - ;; (tabbar/minimize-bar route-name))))) -} + (merge {:headerMode "none"} (prepare-config config)))] (set! (-> res .-router .-getStateForAction) (new-get-state-for-action (.-getStateForAction (.-router res)))) res)) @@ -114,21 +89,7 @@ (defn twopane-navigator [routes config] (nav-reagent/twopane-navigator routes - (merge {:headerMode "none" - ;; :onTransitionStart (fn [n] - ;; (let [idx (.. n - ;; -navigation - ;; -state - ;; -index) - ;; routes (.. n - ;; -navigation - ;; -state - ;; -routes)] - ;; (when (and (array? routes) (int? idx)) - ;; (let [route (aget routes idx) - ;; route-name (keyword (.-routeName route))] - ;; (tabbar/minimize-bar route-name))))) -} + (merge {:headerMode "none"} (prepare-config config)))) (defn switch-navigator [routes config] @@ -146,29 +107,19 @@ (defn build-screen "Builds screen from specified configuration. Currently screen can be - keyword, which points to some specific route - - vector of [:modal :screen-key] type when screen should be wrapped as modal - map with `name`, `screens`, `config` keys, where `screens` is a vector of children and `config` is `stack-navigator` configuration" [navigator screen] (let [[screen-name screen-config] (cond (keyword? screen) [screen (screens/get-screen screen)] + (map? screen) [(:name screen) screen] :else screen) - res (cond - (map? screen-config) + res (if (map? screen-config) (let [{:keys [screens config]} screen-config] - (navigator - (stack-screens navigator screens) - config)) - - (vector? screen-config) - (let [[_ screen] screen-config] - (nav-reagent/stack-screen - (wrap-modal screen-name screen))) - - :else + (navigator (stack-screens navigator screens) config)) (nav-reagent/stack-screen (wrap screen-name screen-config)))] [screen-name (cond-> {:screen res} (not (get back-actions/back-actions screen-name)) @@ -182,36 +133,34 @@ (map (partial build-screen navigator)) (into {}))) -(defn wrap-tabbar - [nav] - [tabbar/tabbar nav view-id]) +(defn app-init-progress [] + (fn [] + ;; NOTE: Doring the first navigate-to dispatch the naviagor is not initialized and event does not execute. + ;; this little hack repeats the latest navigate event after initialization. + (when-let [view-id @(re-frame/subscribe [:view-id])] + (re-frame/dispatch [:navigate-to view-id nil])) + [progress/progress])) -;; TODO: Add a switch view to be shown while waiting for multiaccounts initialization (defn get-main-component [two-pane?] - (let [view-id :multiaccounts] ;For now - (switch-navigator - (into {} - [(build-screen stack-navigator (intro-login-stack/login-stack view-id)) - (build-screen stack-navigator (intro-login-stack/intro-stack)) - [:tabs-and-modals - {:screen - (stack-navigator - (merge - {:tabs - {:screen (tab-navigator - (->> [(build-screen (if two-pane? twopane-navigator stack-navigator) chat-stack/chat-stack) - (build-screen stack-navigator browser-stack/browser-stack) - (build-screen stack-navigator wallet-stack/wallet-stack) - (build-screen stack-navigator profile-stack/profile-stack)] - (into {})) - {:initialRouteName :chat-stack - :tabBarComponent (reagent.core/reactify-component - wrap-tabbar)})}} - (stack-screens stack-navigator modals/modal-screens)) - {:mode :modal - :defaultNavigationOptions {:cardOverlayEnabled true - :gestureEnabled true} - :initialRouteName :tabs})}]]) - {:initialRouteName (if (= view-id :intro) - :intro-stack - :login-stack)}))) + (switch-navigator + (into {} + [[:init-progress {:screen (nav-reagent/stack-screen app-init-progress)}] + (build-screen stack-navigator intro-login-stack/intro-stack) + [:tabs-and-modals + {:screen + (stack-navigator + (merge + {:tabs + {:screen (tab-navigator + (->> [(build-screen (if two-pane? twopane-navigator stack-navigator) chat-stack/chat-stack) + (build-screen stack-navigator browser-stack/browser-stack) + (build-screen stack-navigator wallet-stack/wallet-stack) + (build-screen stack-navigator profile-stack/profile-stack)] + (into {})) + {:initialRouteName :chat-stack + :tabBarComponent tabbar/tabbar})}} + (stack-screens stack-navigator modals/modal-screens)) + {:mode :modal + :defaultNavigationOptions {:gestureEnabled true} + :initialRouteName :tabs})}]]) + {:initialRouteName :init-progress})) diff --git a/src/status_im/ui/screens/routing/intro_login_stack.cljs b/src/status_im/ui/screens/routing/intro_login_stack.cljs index a0bb4887dd3..de4b16fb776 100644 --- a/src/status_im/ui/screens/routing/intro_login_stack.cljs +++ b/src/status_im/ui/screens/routing/intro_login_stack.cljs @@ -1,55 +1,8 @@ (ns status-im.ui.screens.routing.intro-login-stack (:require [status-im.utils.config :as config])) -(def all-screens - #{:login - :progress - :create-multiaccount - :create-multiaccount-generate-key - :create-multiaccount-choose-key - :create-multiaccount-select-key-storage - :create-multiaccount-create-code - :create-multiaccount-confirm-code - :recover-multiaccount-enter-phrase - :recover-multiaccount-select-storage - :recover-multiaccount-enter-password - :recover-multiaccount-confirm-password - :recover-multiaccount-success - :multiaccounts - :intro - :intro-wizard - :hardwallet-authentication-method - :hardwallet-connect - :keycard-connection-lost - :keycard-connection-lost-setup - :keycard-nfc-on - :keycard-pairing - :keycard-blank - :keycard-wrong - :keycard-unpaired - :keycard-login-pin - :keycard-login-connect-card - :not-keycard - :keycard-onboarding-intro - :keycard-onboarding-start - :keycard-onboarding-puk-code - :keycard-onboarding-preparing - :keycard-onboarding-finishing - :keycard-onboarding-pin - :keycard-onboarding-recovery-phrase - :keycard-onboarding-recovery-phrase-confirm-word1 - :keycard-onboarding-recovery-phrase-confirm-word2 - :keycard-recovery-intro - :keycard-recovery-start - :keycard-recovery-pair - :keycard-recovery-recovering - :keycard-recovery-success - :keycard-recovery-no-key - :keycard-recovery-pin}) - -(defn login-stack [view-id] - {:name :login-stack - :screens (cond-> [:login +(def login-stack + {:screens (cond-> [:login :multiaccounts :intro-wizard :progress @@ -75,16 +28,10 @@ :keycard-blank :keycard-wrong :keycard-unpaired - :not-keycard])) - :config (if - ;; add view-id here if you'd like that view to be - ;; first view when app is started - (#{:login :progress :multiaccounts :enter-pin-login :keycard-login-pin} view-id) - {:initialRouteName view-id} - {:initialRouteName :login})}) + :not-keycard]))}) -(defn intro-stack [] - (-> (login-stack :intro) +(def intro-stack + (-> login-stack (update :screens conj :intro :intro-wizard @@ -109,4 +56,4 @@ :keycard-recovery-no-key :keycard-recovery-pin) (assoc :name :intro-stack) - (assoc :config {:initialRouteName :intro}))) + (assoc :config {:initialRouteName :progress}))) diff --git a/src/status_im/ui/screens/routing/screens.cljs b/src/status_im/ui/screens/routing/screens.cljs index 9dadd52eaf8..dd1247c8070 100644 --- a/src/status_im/ui/screens/routing/screens.cljs +++ b/src/status_im/ui/screens/routing/screens.cljs @@ -70,6 +70,7 @@ (def all-screens {:login login/login :progress progress/progress + :intro-progress progress/progress :create-multiaccount-generate-key intro/wizard-generate-key :create-multiaccount-choose-key intro/wizard-choose-key :create-multiaccount-select-key-storage intro/wizard-select-key-storage @@ -86,10 +87,10 @@ :hardwallet-connect hardwallet.connect/hardwallet-connect :hardwallet-connect-settings hardwallet.connect/hardwallet-connect :hardwallet-connect-sign hardwallet.connect/hardwallet-connect - :hardwallet-connect-modal [:modal hardwallet.connect/hardwallet-connect] + :hardwallet-connect-modal hardwallet.connect/hardwallet-connect :enter-pin-settings hardwallet.pin/enter-pin :enter-pin-sign hardwallet.pin/enter-pin - :enter-pin-modal [:modal hardwallet.pin/enter-pin] + :enter-pin-modal hardwallet.pin/enter-pin :keycard-onboarding-intro keycard.onboarding/intro :keycard-onboarding-start keycard.onboarding/start :keycard-onboarding-puk-code keycard.onboarding/puk-code @@ -121,29 +122,29 @@ :chat chat/chat :select-chat chat/select-chat :profile profile.contact/profile - :new-chat [:modal new-chat/new-chat] - :qr-scanner [:modal qr-scanner/qr-scanner] + :new-chat new-chat/new-chat + :qr-scanner qr-scanner/qr-scanner :new-group group/new-group :add-participants-toggle-list group/add-participants-toggle-list :contact-toggle-list group/contact-toggle-list :group-chat-profile profile.group-chat/group-chat-profile - :new-public-chat [:modal new-public-chat/new-public-chat] + :new-public-chat new-public-chat/new-public-chat :open-dapp open-dapp/open-dapp :browser browser/browser :stickers stickers/packs :stickers-pack stickers/pack - :stickers-pack-modal [:modal stickers/pack-modal] - :tribute-learn-more [:modal tr-to-talk/learn-more] - :chat-modal [:modal chat/chat-modal] + :stickers-pack-modal stickers/pack-modal + :tribute-learn-more tr-to-talk/learn-more + :chat-modal chat/chat-modal :wallet wallet.accounts/accounts-overview :wallet-account wallet.account/account :collectibles-list collectibles/collectibles-list - :contact-code [:modal wallet.components/contact-code] + :contact-code wallet.components/contact-code :wallet-transaction-details wallet-transactions/transaction-details :wallet-settings-assets wallet-settings/manage-assets :wallet-add-custom-token custom-tokens/add-custom-token :wallet-custom-token-details custom-tokens/custom-token-details - :wallet-transactions-filter [:modal wallet-transactions/filter-history] + :wallet-transactions-filter wallet-transactions/filter-history :my-profile profile.user/my-profile :contacts-list contacts-list/contacts-list :ens-main ens/main @@ -181,7 +182,7 @@ :reset-card hardwallet.settings/reset-card :keycard-settings hardwallet.settings/keycard-settings :mobile-network-settings mobile-network-settings/mobile-network-settings - :welcome [:modal home/welcome] + :welcome home/welcome :keycard-welcome keycard/welcome :add-new-account add-account/add-account :add-watch-account add-account/add-watch-account diff --git a/src/status_im/ui/screens/views.cljs b/src/status_im/ui/screens/views.cljs index e2228e1471e..81c5296ca56 100644 --- a/src/status_im/ui/screens/views.cljs +++ b/src/status_im/ui/screens/views.cljs @@ -8,7 +8,6 @@ [status-im.ui.components.bottom-sheet.core :as bottom-sheet] [status-im.cljs-react-navigation.reagent :as navigation] [reagent.core :as reagent] - [taoensso.timbre :as log] [status-im.ui.screens.mobile-network-settings.view :as mobile-network-settings] [status-im.ui.screens.keycard.views :as keycard] [status-im.ui.screens.home.sheet.views :as home.sheet] @@ -90,23 +89,21 @@ (fn [resolve _] (resolve @state))))) +(defonce main-app-navigator (navigation/create-app-container (routing/get-main-component false))) +(defonce twopane-app-navigator (navigation/create-app-container (routing/get-main-component true))) + (defn main [] - (let [view-id (re-frame/subscribe [:view-id]) - main-app-navigator (navigation/create-app-container (routing/get-main-component false)) - twopane-app-navigator (navigation/create-app-container (routing/get-main-component true)) - two-pane? (reagent/atom (dimensions/fit-two-pane?))] + (let [two-pane? (reagent/atom (dimensions/fit-two-pane?))] (.addEventListener react/dimensions "change" (fn [_] (let [two-pane-enabled? (dimensions/fit-two-pane?)] (re-frame/dispatch [:set-two-pane-ui-enabled two-pane-enabled?]) - (log/debug ":set-two-pane " two-pane-enabled?) (reset! two-pane? two-pane-enabled?)))) (reagent/create-class {:component-did-mount (fn [] (re-frame/dispatch [:set-two-pane-ui-enabled @two-pane?]) - (log/debug :main-component-did-mount @view-id) (utils.universal-links/initialize)) :component-will-unmount @@ -117,26 +114,17 @@ (when-not platform/desktop? (react/dismiss-keyboard!))) - :component-did-update - (fn [] - (log/debug :main-component-did-update @view-id)) - :reagent-render (fn [] [react/safe-area-provider [react/view {:flex 1} [(if @two-pane? twopane-app-navigator main-app-navigator) (merge {:ref (fn [r] - (navigation/set-navigator-ref r) - ;; TODO: Review this code - (when (and platform/android? - (not debug?) - (not (contains? #{:intro :login :progress} @view-id))) - (navigation/navigate-to @view-id nil))) + (navigation/set-navigator-ref r)) :enableURLHandling false} (when debug? ;; https://github.com/react-navigation/native/blob/d0b24924b2e075fed3bd6586339d34fdd4c2b78e/src/createAppContainer.js#L293 - ;; urlShouldBe handled by react-navigation otherwise loadNavigationState does not work + ;; url should be handled by react-navigation otherwise loadNavigationState does not work {:enableURLHandling true :persistNavigationState persist-state! :loadNavigationState load-state!}))] diff --git a/src/status_im/ui/screens/wallet/transactions/styles.cljs b/src/status_im/ui/screens/wallet/transactions/styles.cljs index 8e39adfe123..f87baba0576 100644 --- a/src/status_im/ui/screens/wallet/transactions/styles.cljs +++ b/src/status_im/ui/screens/wallet/transactions/styles.cljs @@ -5,7 +5,7 @@ (defn tab [active?] {:flex 1 - :height tabs.styles/tab-height + :height tabs.styles/tabs-height :justify-content :center :align-items :center :padding-bottom (if active? 0 1) @@ -16,7 +16,7 @@ (def tabs-container {:flex-direction :row - :height tabs.styles/tab-height}) + :height tabs.styles/tabs-height}) (defn tab-title [active?] diff --git a/src/status_im/utils/logging/core.cljs b/src/status_im/utils/logging/core.cljs index b238938963e..31a0e12916b 100644 --- a/src/status_im/utils/logging/core.cljs +++ b/src/status_im/utils/logging/core.cljs @@ -49,7 +49,6 @@ :initial-props :keyboard-height :keyboard-max-height - :navigation-stack :network :network-status :peers-count