status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

merge develop

This commit is contained in:
Adrian Tiberius 2016-06-30 20:10:41 +03:00
parent 06e0332f4f e73e9ee7b6
commit 3a3a39b71d
3 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
android/app/build.gradle
View File

@ -133,8 +133,8 @@ dependencies {
compile project(':react-native-camera') compile project(':react-native-camera')
compile project(':react-native-status') compile project(':react-native-status')
compile project(':react-native-orientation') compile project(':react-native-orientation')
compile(name:'statusgo-android-16', ext:'aar') //compile(name:'statusgo-android-16', ext:'aar')
//compile(group: 'status-im', name: 'status-go', version: '0.1.0-201606231357-85abe1', ext: 'aar') compile(group: 'status-im', name: 'status-go', version: '0.1.0-201606301634-5d7b29', ext: 'aar')
compile fileTree(dir: "node_modules/realm/android/libs", include: ["*.jar"]) compile fileTree(dir: "node_modules/realm/android/libs", include: ["*.jar"])
} }

8
src/status_im/chat/handlers/animation.cljs
View File

@ -29,10 +29,10 @@
(fn [{:keys [current-chat-id] :as db} _] (fn [{:keys [current-chat-id] :as db} _]
(let [suggestions? (seq (get-in db [:command-suggestions current-chat-id])) (let [suggestions? (seq (get-in db [:command-suggestions current-chat-id]))
current (get-in db [:animations :command-suggestions-height]) current (get-in db [:animations :command-suggestions-height])
height (if suggestions? middle-height 30) height (if suggestions? middle-height input-height)
changed? (if (and suggestions? changed? (if (and suggestions?
(not (nil? current)) (not (nil? current))
(not= 30 current)) (not= input-height current))
identity inc)] identity inc)]
(-> db (-> db
(update :animations assoc :command-suggestions-height height) (update :animations assoc :command-suggestions-height height)
@ -44,7 +44,7 @@
type (get-in db path)] type (get-in db path)]
(if (= :response type) (if (= :response type)
minimum-suggestion-height minimum-suggestion-height
30))) input-height)))
(register-handler :animate-show-response (register-handler :animate-show-response
[(after #(dispatch [:command-edit-mode]))] [(after #(dispatch [:command-edit-mode]))]
@ -97,7 +97,7 @@
(let [suggestions (get-in db [:command-suggestions current-chat-id])] (let [suggestions (get-in db [:command-suggestions current-chat-id])]
(if (seq suggestions) (if (seq suggestions)
minimum-command-suggestions-height minimum-command-suggestions-height
0.1))) input-height)))
(register-handler :fix-commands-suggestions-height (register-handler :fix-commands-suggestions-height
(fix-height :command-suggestions-height (fix-height :command-suggestions-height

8
src/status_im/chat/views/suggestions.cljs
View File

@ -115,14 +115,12 @@
on-update on-update
:reagent-render :reagent-render
(fn [h & elements] (fn [h & elements]
@changed @to-response-height @changed
(into [animated-view {:style (st/container h)}] elements))}))) (into [animated-view {:style (st/container h)}] elements))})))
(defn suggestion-container [] (defn suggestion-container []
(let [h (anim/create-value 0.1) (let [h (anim/create-value c/input-height)]
command? (subscribe [:command?])]
(when-not @command?
[container h [container h
[header h] [header h]
[suggestions-view] [suggestions-view]
[view {:height c/input-height}]]))) [view {:height c/input-height}]]))