Skip to content

Commit

Permalink
WIP
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ferossgp
Ferossgp committed Feb 4, 2020
1 parent 3c5f0d5 commit 89e10e7
Show file tree
Hide file tree
Showing 30 changed files with 565 additions and 1,261 deletions.
2 changes: 1 addition & 1 deletion android/app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 2 additions & 0 deletions components/src/status_im/ui/components/react.cljs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion mobile/js_files/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"react-native-webview": "^6.11.1",
"react-native-webview-bridge": "git+https://github.com/status-im/react-native-webview-bridge.git#fix/community-webview",
"react-navigation": "^4.0.10",
"react-navigation-stack": "^2.0.16",
"react-navigation-stack": "^2.1.0",
"react-navigation-tabs": "^2.7.0",
"web3-utils": "^1.2.1"
},
Expand Down
8 changes: 4 additions & 4 deletions mobile/js_files/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5023,10 +5023,10 @@ react-native@0.61.5:
stacktrace-parser "^0.1.3"
whatwg-fetch "^3.0.0"

react-navigation-stack@^2.0.16:
version "2.0.16"
resolved "https://registry.yarnpkg.com/react-navigation-stack/-/react-navigation-stack-2.0.16.tgz#083ee644eeb600782222ff1d9ef6df939120ec8a"
integrity sha512-l6Fqvz0tvs7i9+KHZDW9hdQbzzgE78bq85pLALllyiHBfz/aFAaoNG4RUWNSen+54uU4xLC5uioowxTJPRLQWQ==
react-navigation-stack@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/react-navigation-stack/-/react-navigation-stack-2.1.0.tgz#3cf2d9ce64d3344db2b1def8ba226ca6a68783d5"
integrity sha512-IKv1Or7HyWvMZM6Qmc4Owz+l9nn3Jmmm+yDOeEdhGly+yGFKVKsxXKVlpmTH7L+xHCTVPb6dc/p4CisGAvdtQw==
dependencies:
color "^3.1.2"
react-native-iphone-x-helper "^1.2.1"
Expand Down
22 changes: 1 addition & 21 deletions nix/lein/lein-project-deps-maven-inputs.txt
View file
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Loading

0 comments on commit 89e10e7

Please sign in to comment.