Skip to content

Commit

Permalink
added text-input area
Browse files Browse the repository at this point in the history
  • Loading branch information
@GTDev87
GTDev87 committed Dec 7, 2015
1 parent 9094da2 commit e7c3c00
Show file tree
Hide file tree
Showing 21 changed files with 588 additions and 80 deletions.
412 changes: 412 additions & 0 deletions figwheel_server.log
View file

Large diffs are not rendered by default.

48 changes: 33 additions & 15 deletions src/me_time/views/react-native/task-list.cljs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,32 +9,50 @@
(def view (r/adapt-react-class (.-View js/React)))
(def text (r/adapt-react-class (.-Text js/React)))
(def touchable-native-feedback (r/adapt-react-class (.-TouchableNativeFeedback js/React)))
(def text-input (r/adapt-react-class (.-TextInput js/React)))

(defn view-task-context [task-context-data task-context-dispatch-partial]
(let [task-dispatch-partial (partial task-context-dispatch-partial (:id task-context-data))]
[view
{:style {:flexDirection "row"}}
{:style {:flexDirection "row" :alignItems "center"}}
[text
{}
(str "Task # " (:id task-context-data) " = ")]
(str (+ (:id task-context-data) 1) ". ")]
(view-task (:task task-context-data) task-dispatch-partial)]))

(defn view-task-list [task-list-data update-list-atom]
(let [task-list (wrap-task-list task-list-data)
list-dispatch-partial (partial update-list-atom task-list-data)]
[view {:style {:flexDirection "column" :margin 40 :alignItems "center"}}

[view
; {:style {:flexDirection "column" :margin 40 :alignItems "flex-start"}}
(map
(fn [element] (view-task-context element (partial list-dispatch-partial update-task-id)))
(:task-contexts task-list))
[touchable-native-feedback
{:on-press (fn []
(list-dispatch-partial add-task (str "TASK" (:next-id task-list))))
; :style {:backgroundColor "#999" }
:background (.TouchableNativeFeedback/SelectableBackground js/React)
}
[view
{:style {:backgroundColor "red"}}
[text
{:style {:color "white" :textAlign "center" :fontWeight "bold"}}
"Add Task"]]]]))
[view
{:style {:flexDirection "row" :alignItems "center"}}
[(fn []
[text-input
{
:style {
; :flexDirection "column"
:height 1
:width 2
; :borderColor "blue"
; :backgroundColor "green"
:borderWidth 12
}
:on-submit-editing #(do ())
:on-change-text #(do (r/flush))
:value 1
}])]
[touchable-native-feedback
{:on-press (fn []
(list-dispatch-partial add-task (str "TASK" (:next-id task-list))))
; :style {:backgroundColor "#999" }
:background (.TouchableNativeFeedback/SelectableBackground js/React)
}
[view
{:style {:backgroundColor "red"}}
[text
{:style {:color "white" :textAlign "center" :fontWeight "bold"}}
"Add Task"]]]]]))
25 changes: 21 additions & 4 deletions src/me_time/views/react-native/task.cljs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,16 @@
(set! js/React (js/require "react-native/Libraries/react-native/react-native.js"))

(def touchable-native-feedback (r/adapt-react-class (.-TouchableNativeFeedback js/React)))
(def text-input (r/adapt-react-class (.-TextInput js/React)))

(def view (r/adapt-react-class (.-View js/React)))
(def text (r/adapt-react-class (.-Text js/React)))

(def view (r/adapt-react-class (.-View js/React)))
(def text (r/adapt-react-class (.-Text js/React)))

(defn view-task [task-data task-dispatch-partial]
(let [task (wrap-task task-data)]
[view
{:style {:flexDirection "row"}}
{:style {:flexDirection "row" :alignItems "center"}}
[touchable-native-feedback
{:on-press (fn []
(task-dispatch-partial update-task-name "New Name"))
Expand All @@ -25,7 +27,22 @@
[text
{:style {:color "white" :textAlign "center" :fontWeight "bold"}}
"Change"]]]
[(fn []
[text-input
{
:style {
; :flexDirection "column"
:height 1
:width 2
; :borderColor "blue"
; :backgroundColor "green"
:borderWidth 1
}
:on-submit-editing #(do ())
:on-change-text #(do (r/flush))
:value 1
}])]
[text
{}
(str (:name task) " ")]
(str (:name task) " ")]
(view-timer (:timer task) (partial task-dispatch-partial update-timer))]))
2 changes: 1 addition & 1 deletion src/me_time/views/react-native/timer.cljs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
{:style {:flexDirection "row"}}
[text
{}; :style {:fontSize 30 :fontWeight "100" :marginBottom 20 :textAlign "center"}
(str "timer = " (quot (:duration-milliseconds timer) 1000))]
(str " " (quot (:duration-milliseconds timer) 1000))]
[view
[touchable-native-feedback
{:on-press click-functions
Expand Down
2 changes: 1 addition & 1 deletion target/android/env/android/main.cljs.cache.edn
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
;; Analyzed by ClojureScript 1.7.170
{:name env.android.main, :doc nil, :excludes #{}, :use-macros nil, :require-macros {figwheel figwheel.client, figwheel.client figwheel.client}, :uses nil, :requires {core me-time.android.core, me-time.android.core me-time.android.core, figwheel figwheel.client, figwheel.client figwheel.client}, :imports nil, :cljs.analyzer/constants {:seen #{:heads-up-display :jsload-callback :websocket-url}, :order [:websocket-url :heads-up-display :jsload-callback]}}
{:use-macros nil, :excludes #{}, :name env.android.main, :imports nil, :requires {core me-time.android.core, me-time.android.core me-time.android.core, figwheel figwheel.client, figwheel.client figwheel.client}, :uses nil, :require-macros {figwheel figwheel.client, figwheel.client figwheel.client}, :cljs.analyzer/constants {:seen #{:heads-up-display :jsload-callback :websocket-url}, :order [:websocket-url :heads-up-display :jsload-callback]}, :doc nil}
2 changes: 1 addition & 1 deletion target/android/me_time/android/core.cljs.cache.edn
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
;; Analyzed by ClojureScript 1.7.170
{:use-macros {require-img env.require-img}, :excludes #{}, :name me-time.android.core, :imports nil, :requires {r reagent.core, reagent.core reagent.core, re-frame.core re-frame.core, me-time.handlers me-time.handlers, me-time.subs me-time.subs, me-time.models.task me-time.models.task, me-time.models.timer me-time.models.timer, me-time.models.task-list me-time.models.task-list, me-time.views.react-native.task-list me-time.views.react-native.task-list}, :uses {update-tick me-time.models.timer, atom reagent.core, subscribe re-frame.core, view-task-list me-time.views.react-native.task-list, dispatch-sync re-frame.core, update-timer me-time.models.task, update-all-task me-time.models.task-list, dispatch re-frame.core}, :defs {mount-root {:protocol-inline nil, :meta {:file "/Users/GT/work/re-natal-projects/me-time/src/me_time/android/core.cljs", :line 45, :column 7, :end-line 45, :end-column 17, :arglists (quote ([]))}, :name me-time.android.core/mount-root, :variadic false, :file "/Users/GT/work/re-natal-projects/me-time/src/me_time/android/core.cljs", :end-column 17, :method-params ([]), :protocol-impl nil, :arglists-meta (nil nil), :column 1, :line 45, :end-line 45, :max-fixed-arity 0, :fn-var true, :arglists (quote ([]))}, view {:name me-time.android.core/view, :file "/Users/GT/work/re-natal-projects/me-time/src/me_time/android/core.cljs", :line 18, :column 1, :end-line 18, :end-column 10, :meta {:file "/Users/GT/work/re-natal-projects/me-time/src/me_time/android/core.cljs", :line 18, :column 6, :end-line 18, :end-column 10}}, text {:name me-time.android.core/text, :file "/Users/GT/work/re-natal-projects/me-time/src/me_time/android/core.cljs", :line 17, :column 1, :end-line 17, :end-column 10, :meta {:file "/Users/GT/work/re-natal-projects/me-time/src/me_time/android/core.cljs", :line 17, :column 6, :end-line 17, :end-column 10}}, logo-img {:name me-time.android.core/logo-img, :file "/Users/GT/work/re-natal-projects/me-time/src/me_time/android/core.cljs", :line 22, :column 1, :end-line 22, :end-column 14, :meta {:file "/Users/GT/work/re-natal-projects/me-time/src/me_time/android/core.cljs", :line 22, :column 6, :end-line 22, :end-column 14}}, time-updater {:name me-time.android.core/time-updater, :file "/Users/GT/work/re-natal-projects/me-time/src/me_time/android/core.cljs", :line 28, :column 1, :end-line 28, :end-column 22, :meta {:file "/Users/GT/work/re-natal-projects/me-time/src/me_time/android/core.cljs", :line 28, :column 10, :end-line 28, :end-column 22}}, init {:protocol-inline nil, :meta {:file "/Users/GT/work/re-natal-projects/me-time/src/me_time/android/core.cljs", :line 48, :column 16, :end-line 48, :end-column 20, :export true, :arglists (quote ([]))}, :name me-time.android.core/init, :variadic false, :file "/Users/GT/work/re-natal-projects/me-time/src/me_time/android/core.cljs", :end-column 20, :method-params ([]), :protocol-impl nil, :export true, :arglists-meta (nil nil), :column 1, :line 48, :end-line 48, :max-fixed-arity 0, :fn-var true, :arglists (quote ([]))}, touchable-highlight {:name me-time.android.core/touchable-highlight, :file "/Users/GT/work/re-natal-projects/me-time/src/me_time/android/core.cljs", :line 20, :column 1, :end-line 20, :end-column 25, :meta {:file "/Users/GT/work/re-natal-projects/me-time/src/me_time/android/core.cljs", :line 20, :column 6, :end-line 20, :end-column 25}}, app-registry {:name me-time.android.core/app-registry, :file "/Users/GT/work/re-natal-projects/me-time/src/me_time/android/core.cljs", :line 16, :column 1, :end-line 16, :end-column 18, :meta {:file "/Users/GT/work/re-natal-projects/me-time/src/me_time/android/core.cljs", :line 16, :column 6, :end-line 16, :end-column 18}}, update-list-atom {:protocol-inline nil, :meta {:file "/Users/GT/work/re-natal-projects/me-time/src/me_time/android/core.cljs", :line 24, :column 7, :end-line 24, :end-column 23, :arglists (quote ([task-list update-fn & args])), :top-fn {:variadic true, :max-fixed-arity 2, :method-params [(task-list update-fn args)], :arglists ([task-list update-fn & args]), :arglists-meta (nil)}}, :name me-time.android.core/update-list-atom, :variadic true, :file "/Users/GT/work/re-natal-projects/me-time/src/me_time/android/core.cljs", :end-column 23, :top-fn {:variadic true, :max-fixed-arity 2, :method-params [(task-list update-fn args)], :arglists ([task-list update-fn & args]), :arglists-meta (nil)}, :method-params [(task-list update-fn args)], :protocol-impl nil, :arglists-meta (nil), :column 1, :line 24, :end-line 24, :max-fixed-arity 2, :fn-var true, :arglists ([task-list update-fn & args])}, widget {:protocol-inline nil, :meta {:file "/Users/GT/work/re-natal-projects/me-time/src/me_time/android/core.cljs", :line 37, :column 7, :end-line 37, :end-column 13, :arglists (quote ([]))}, :name me-time.android.core/widget, :variadic false, :file "/Users/GT/work/re-natal-projects/me-time/src/me_time/android/core.cljs", :end-column 13, :method-params ([]), :protocol-impl nil, :arglists-meta (nil nil), :column 1, :line 37, :end-line 37, :max-fixed-arity 0, :fn-var true, :arglists (quote ([]))}, image {:name me-time.android.core/image, :file "/Users/GT/work/re-natal-projects/me-time/src/me_time/android/core.cljs", :line 19, :column 1, :end-line 19, :end-column 11, :meta {:file "/Users/GT/work/re-natal-projects/me-time/src/me_time/android/core.cljs", :line 19, :column 6, :end-line 19, :end-column 11}}}, :require-macros {env.require-img env.require-img}, :cljs.analyzer/constants {:seen #{:initialize-db :width :source :flexDirection :get-tasks :style :marginBottom :uri :height :alignItems :margin :update-tasks}, :order [:uri :update-tasks :get-tasks :style :flexDirection :margin :alignItems :source :width :height :marginBottom :initialize-db]}, :doc nil}
{:use-macros {require-img env.require-img}, :excludes #{}, :name me-time.android.core, :imports nil, :requires {r reagent.core, reagent.core reagent.core, re-frame.core re-frame.core, me-time.handlers me-time.handlers, me-time.subs me-time.subs, me-time.models.task me-time.models.task, me-time.models.timer me-time.models.timer, me-time.models.task-list me-time.models.task-list, me-time.views.react-native.task-list me-time.views.react-native.task-list}, :uses {update-tick me-time.models.timer, atom reagent.core, subscribe re-frame.core, view-task-list me-time.views.react-native.task-list, dispatch-sync re-frame.core, update-timer me-time.models.task, update-all-task me-time.models.task-list, dispatch re-frame.core}, :defs {mount-root {:protocol-inline nil, :meta {:file "/Users/GT/work/re-natal-projects/me-time/src/me_time/android/core.cljs", :line 45, :column 7, :end-line 45, :end-column 17, :arglists (quote ([]))}, :name me-time.android.core/mount-root, :variadic false, :file "src/me_time/android/core.cljs", :end-column 17, :method-params ([]), :protocol-impl nil, :arglists-meta (nil nil), :column 1, :line 45, :end-line 45, :max-fixed-arity 0, :fn-var true, :arglists (quote ([]))}, view {:name me-time.android.core/view, :file "src/me_time/android/core.cljs", :line 18, :column 1, :end-line 18, :end-column 10, :meta {:file "/Users/GT/work/re-natal-projects/me-time/src/me_time/android/core.cljs", :line 18, :column 6, :end-line 18, :end-column 10}}, text {:name me-time.android.core/text, :file "src/me_time/android/core.cljs", :line 17, :column 1, :end-line 17, :end-column 10, :meta {:file "/Users/GT/work/re-natal-projects/me-time/src/me_time/android/core.cljs", :line 17, :column 6, :end-line 17, :end-column 10}}, logo-img {:name me-time.android.core/logo-img, :file "src/me_time/android/core.cljs", :line 22, :column 1, :end-line 22, :end-column 14, :meta {:file "/Users/GT/work/re-natal-projects/me-time/src/me_time/android/core.cljs", :line 22, :column 6, :end-line 22, :end-column 14}}, time-updater {:name me-time.android.core/time-updater, :file "src/me_time/android/core.cljs", :line 28, :column 1, :end-line 28, :end-column 22, :meta {:file "/Users/GT/work/re-natal-projects/me-time/src/me_time/android/core.cljs", :line 28, :column 10, :end-line 28, :end-column 22}}, init {:protocol-inline nil, :meta {:file "/Users/GT/work/re-natal-projects/me-time/src/me_time/android/core.cljs", :line 48, :column 16, :end-line 48, :end-column 20, :export true, :arglists (quote ([]))}, :name me-time.android.core/init, :variadic false, :file "src/me_time/android/core.cljs", :end-column 20, :method-params ([]), :protocol-impl nil, :export true, :arglists-meta (nil nil), :column 1, :line 48, :end-line 48, :max-fixed-arity 0, :fn-var true, :arglists (quote ([]))}, touchable-highlight {:name me-time.android.core/touchable-highlight, :file "src/me_time/android/core.cljs", :line 20, :column 1, :end-line 20, :end-column 25, :meta {:file "/Users/GT/work/re-natal-projects/me-time/src/me_time/android/core.cljs", :line 20, :column 6, :end-line 20, :end-column 25}}, app-registry {:name me-time.android.core/app-registry, :file "src/me_time/android/core.cljs", :line 16, :column 1, :end-line 16, :end-column 18, :meta {:file "/Users/GT/work/re-natal-projects/me-time/src/me_time/android/core.cljs", :line 16, :column 6, :end-line 16, :end-column 18}}, update-list-atom {:protocol-inline nil, :meta {:file "/Users/GT/work/re-natal-projects/me-time/src/me_time/android/core.cljs", :line 24, :column 7, :end-line 24, :end-column 23, :arglists (quote ([task-list update-fn & args])), :top-fn {:variadic true, :max-fixed-arity 2, :method-params [(task-list update-fn args)], :arglists ([task-list update-fn & args]), :arglists-meta (nil)}}, :name me-time.android.core/update-list-atom, :variadic true, :file "src/me_time/android/core.cljs", :end-column 23, :top-fn {:variadic true, :max-fixed-arity 2, :method-params [(task-list update-fn args)], :arglists ([task-list update-fn & args]), :arglists-meta (nil)}, :method-params [(task-list update-fn args)], :protocol-impl nil, :arglists-meta (nil), :column 1, :line 24, :end-line 24, :max-fixed-arity 2, :fn-var true, :arglists ([task-list update-fn & args])}, widget {:protocol-inline nil, :meta {:file "/Users/GT/work/re-natal-projects/me-time/src/me_time/android/core.cljs", :line 37, :column 7, :end-line 37, :end-column 13, :arglists (quote ([]))}, :name me-time.android.core/widget, :variadic false, :file "src/me_time/android/core.cljs", :end-column 13, :method-params ([]), :protocol-impl nil, :arglists-meta (nil nil), :column 1, :line 37, :end-line 37, :max-fixed-arity 0, :fn-var true, :arglists (quote ([]))}, image {:name me-time.android.core/image, :file "src/me_time/android/core.cljs", :line 19, :column 1, :end-line 19, :end-column 11, :meta {:file "/Users/GT/work/re-natal-projects/me-time/src/me_time/android/core.cljs", :line 19, :column 6, :end-line 19, :end-column 11}}}, :require-macros {env.require-img env.require-img}, :cljs.analyzer/constants {:seen #{:initialize-db :width :source :flexDirection :get-tasks :style :marginBottom :uri :height :alignItems :margin :update-tasks}, :order [:uri :update-tasks :get-tasks :style :flexDirection :margin :alignItems :source :width :height :marginBottom :initialize-db]}, :doc nil}
24 changes: 12 additions & 12 deletions target/android/me_time/android/core.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit e7c3c00

Please sign in to comment.