From 5a63f527d37f64a4920e791955fda45c9eb82b04 Mon Sep 17 00:00:00 2001
From: virvar <revalka@gmail.com>
Date: Wed, 11 May 2016 13:05:33 +0300
Subject: [PATCH] Add my profile view

Former-commit-id: 3dfc4619244a0e54901d82f74b54232ee729373e
---
 .../src/main/res/drawable-hdpi/icon_dots.png  | Bin 0 -> 181 bytes
 .../src/main/res/drawable-mdpi/icon_dots.png  | Bin 0 -> 130 bytes
 .../src/main/res/drawable-xhdpi/icon_dots.png | Bin 0 -> 210 bytes
 .../main/res/drawable-xxhdpi/icon_dots.png    | Bin 0 -> 301 bytes
 .../main/res/drawable-xxxhdpi/icon_dots.png   | Bin 0 -> 437 bytes
 src/syng_im/android/core.cljs                 |   5 +-
 src/syng_im/components/drawer.cljs            |  70 +++++++++---------
 src/syng_im/components/profile.cljs           |  39 +++++++++-
 src/syng_im/components/profile_styles.cljs    |  20 ++++-
 src/syng_im/db.cljs                           |   9 ++-
 src/syng_im/handlers.cljs                     |   6 ++
 src/syng_im/subs.cljs                         |  26 +++++--
 12 files changed, 124 insertions(+), 51 deletions(-)
 create mode 100644 android/app/src/main/res/drawable-hdpi/icon_dots.png
 create mode 100644 android/app/src/main/res/drawable-mdpi/icon_dots.png
 create mode 100644 android/app/src/main/res/drawable-xhdpi/icon_dots.png
 create mode 100644 android/app/src/main/res/drawable-xxhdpi/icon_dots.png
 create mode 100644 android/app/src/main/res/drawable-xxxhdpi/icon_dots.png

diff --git a/android/app/src/main/res/drawable-hdpi/icon_dots.png b/android/app/src/main/res/drawable-hdpi/icon_dots.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f9961ec1b999f6bac7fb1d1a7609d572ea21053
GIT binary patch
literal 181
zcmeAS@N?(olHy`uVBq!ia0vp^Y(Ol*0U~b-^ehHajKx9jP7LeL$-D$|@;zM~Lo`H_
zuUz9xt^WTxO89Vnn+2OdLP~_niFKjJ&zw4c<JW(CXUl*N@vhvuKecC%X)Imy_l-Ss
zvx<iykAabaO?p$|g-o>xGhZ|*7^YczwmT;nOG->>bgM~BNtwa6NygdmCsWU2ITkj#
cyU79!YF9m44bQs%1X|7D>FVdQ&MBb@0AP<kssI20

literal 0
HcmV?d00001

diff --git a/android/app/src/main/res/drawable-mdpi/icon_dots.png b/android/app/src/main/res/drawable-mdpi/icon_dots.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5a003f4595ddfe9eaaeae463d26d8a9a72680f4
GIT binary patch
literal 130
zcmeAS@N?(olHy`uVBq!ia0vp^EI=&4!3HD^x83^;q!^2X+?^QKos)S9<k)z+IEF|_
zCQk{x{PoZG_y2X+6cUn>e3GXGU99}`|9`#Y1O{d0$HHm?%#sF;QyEhaY;w>&G3mz5
d9_M3X3@rg_d^*h&YJlc2c)I$ztaD0e0sv>uDgyuj

literal 0
HcmV?d00001

diff --git a/android/app/src/main/res/drawable-xhdpi/icon_dots.png b/android/app/src/main/res/drawable-xhdpi/icon_dots.png
new file mode 100644
index 0000000000000000000000000000000000000000..e4d3d40921fbfa5423efaf03c96ab1cff1910eb4
GIT binary patch
literal 210
zcmeAS@N?(olHy`uVBq!ia0vp^96+qV!3HGtKUiJ>QjEnx?oJHr&dIz4a(X;n978Mw
zlT#R&GDU4?{{R2KjBzHPf}Ma&LQ0BWb=C7r!fqQ>4&U$o|KFIy@ri<pvhrbTH@39e
zv^d9!lK&+o&P-5UnB&LR_J5L(Lm#u4=Zp!=9*l7eK?Mx`UCb@AKY!jm?O)?G>9hl1
zQc8jV<0E~CJ*+RzCQLB@IK$6eb3wJ+<0KQkgqOJiPq-PL>@IF!UFozD=q?6NS3j3^
HP6<r_dL~IK

literal 0
HcmV?d00001

diff --git a/android/app/src/main/res/drawable-xxhdpi/icon_dots.png b/android/app/src/main/res/drawable-xxhdpi/icon_dots.png
new file mode 100644
index 0000000000000000000000000000000000000000..464cfeb09fbf660fc4cff33f6cb322fcff902d9b
GIT binary patch
literal 301
zcmeAS@N?(olHy`uVBq!ia0vp^JV0!~!3HE%&(1akQjEnx?oJHr&dIz4a-Ms-IEHxe
zCZ{ws{r~^p*lXpBr3Oa-y#Jj)uz*)6EhS;cumAR!@1&ROolQ(hVc}{%Dk1U2v{$wM
z|F4ZK8jo0nT-Y6Ye@EQ3NRo@Q|2>B@#mMfc!dZpp16d7OlB!cngC!;Yopmx7wVtop
z%lRbj&7>KN6t?;p@F#gCcQsrwO5}Php2);1Tc^qqIUy=R!|<#t$HVl-D@ILCp;4~s
z{Oc?lBpJK9mzS^G!QkBa(Ox6SfyuzLL`sD{j5&lm#hGEFC-btpDaXW_RM@p64rlZo
x7GLJD^P-HqLWA47FByHxBHtI6%4{r^VF(xaI#1k2j}ho)22WQ%mvv4FO#t}oZ6p8y

literal 0
HcmV?d00001

diff --git a/android/app/src/main/res/drawable-xxxhdpi/icon_dots.png b/android/app/src/main/res/drawable-xxxhdpi/icon_dots.png
new file mode 100644
index 0000000000000000000000000000000000000000..972f7be2fd0051ebd87c33337c4a07224afb7e96
GIT binary patch
literal 437
zcmV;m0ZRUfP)<h;3K|Lk000e1NJLTq000mG002M;1^@s66MgrV00001b5ch_0Itp)
z=>Px$Z%IT!R9FdPWIzLQD*D=g8UCgGWBBI=l#+u=KVo8F+QrPkH0RNsi&v4gFv2+6
z+M#Uke_reR|DPcfD8>X6N2C8SGBQjTWY;RXdUf?LkQ~?mu;w4vw*O~fa6;37l?&9g
zPmn{)6J!W8NChiD<3yn5aIC7a3o8Ej`&#JpyVu(oL4N-I|Ia0$I$X}iZUh6vKUPK-
zJtk0qk)au6C|EBOG_-Nqf>#`*7vyYMRN+;OLsE`Ze`A;fGT;%0DDeW1m_R9vc=f0%
zL3)`$$rC924^@gN-an9D=8x}QzUC7a69Z~7BT5@o5im(ldvfRULU160(l#i05^DfB
zDFgL@)Ps}q>(|%*%1Jq_03}bLm<bSr^9V=*8USUcX~29Chmx6)6_J{qk@b$UM{WpU
zq&QL&65N2%dV%Ch1(fVY>jg;W8?6_B;V@b+KoY|!InW^hFV<lW8Lby!Awd*9+FyVM
f(`bKTSo9YFO5Z38SAyX200000NkvXXu0mjf6eG3y

literal 0
HcmV?d00001

diff --git a/src/syng_im/android/core.cljs b/src/syng_im/android/core.cljs
index a2ecc6c3d5..8cdc69d449 100644
--- a/src/syng_im/android/core.cljs
+++ b/src/syng_im/android/core.cljs
@@ -15,7 +15,7 @@
             [syng-im.components.chats.new-group :refer [new-group]]
             [syng-im.components.chat.new-participants :refer [new-participants]]
             [syng-im.components.chat.remove-participants :refer [remove-participants]]
-            [syng-im.components.profile :refer [profile]]
+            [syng-im.components.profile :refer [profile my-profile]]
             [syng-im.utils.logging :as log]
             [syng-im.utils.utils :refer [toast]]
             [syng-im.navigation :as nav]
@@ -48,7 +48,8 @@
         :new-group [new-group]
         :contact-list [contact-list]
         :chat [chat]
-        :profile [profile]))))
+        :profile [profile]
+        :my-profile [my-profile]))))
 
 (defn init []
   (dispatch-sync [:initialize-db])
diff --git a/src/syng_im/components/drawer.cljs b/src/syng_im/components/drawer.cljs
index c1f7b807f2..362127f69d 100644
--- a/src/syng_im/components/drawer.cljs
+++ b/src/syng_im/components/drawer.cljs
@@ -36,42 +36,44 @@
     name]])
 
 (defn drawer-menu [navigator]
-  [view st/drawer-menu
-   [view st/user-photo-container
-    [user-photo {}]]
-   [view st/name-container
-    [text {:style st/name-text}
-     "Status"]]
-   [view st/menu-items-container
-    [menu-item {:name    "Profile"
-                :handler (fn []
-                           (dispatch [:show-profile navigator]))}]
-    [menu-item {:name    "Settings"
-                :handler (fn []
-                           ;; TODO not implemented
-                           )}]
-    [menu-item {:name    "Discovery"
-                :handler (fn []
-                           (dispatch [:navigate-to :discovery]))}]
-    [menu-item {:name    "Contacts"
-                :handler (fn []
-                           (dispatch [:show-contacts navigator]))}]
-    [menu-item {:name    "Invite friends"
-                :handler (fn []
-                           ;; TODO not implemented
-                           )}]
-    [menu-item {:name    "FAQ"
-                :handler (fn [])}]]
-   [view st/switch-users-container
-    [touchable-opacity {:onPress (fn []
-                                   (close-drawer)
-                                   ;; TODO not implemented
-                                   )}
-     [text {:style st/switch-users-text}
-      "Switch users"]]]])
+  (let [username (subscribe [:username])]
+    (fn [navigator]
+      [view st/drawer-menu
+      [view st/user-photo-container
+       [user-photo {}]]
+      [view st/name-container
+       [text {:style st/name-text}
+        @username]]
+      [view st/menu-items-container
+       [menu-item {:name    "Profile"
+                   :handler (fn []
+                              (dispatch [:show-my-profile]))}]
+       [menu-item {:name    "Settings"
+                   :handler (fn []
+                              ;; TODO not implemented
+                              )}]
+       [menu-item {:name    "Discovery"
+                   :handler (fn []
+                              (dispatch [:navigate-to :discovery]))}]
+       [menu-item {:name    "Contacts"
+                   :handler (fn []
+                              (dispatch [:show-contacts navigator]))}]
+       [menu-item {:name    "Invite friends"
+                   :handler (fn []
+                              ;; TODO not implemented
+                              )}]
+       [menu-item {:name    "FAQ"
+                   :handler (fn [])}]]
+      [view st/switch-users-container
+       [touchable-opacity {:onPress (fn []
+                                      (close-drawer)
+                                      ;; TODO not implemented
+                                      )}
+        [text {:style st/switch-users-text}
+         "Switch users"]]]])))
 
 (defn drawer-view [{:keys [navigator]} items]
-  [drawer-layout-android {:drawerWidth            300
+  [drawer-layout-android {:drawerWidth            260
                           :drawerPosition         js/React.DrawerLayoutAndroid.positions.Left
                           :render-navigation-view #(r/as-element [drawer-menu navigator])
                           :ref  (fn [drawer]
diff --git a/src/syng_im/components/profile.cljs b/src/syng_im/components/profile.cljs
index 7ce6bea22d..85b64b6475 100644
--- a/src/syng_im/components/profile.cljs
+++ b/src/syng_im/components/profile.cljs
@@ -41,10 +41,10 @@
   (let [contact (subscribe [:contact])]
     (fn []
       [scroll-view {:style st/profile}
-       [touchable-highlight {:style    st/profile-back-button-touchable
+       [touchable-highlight {:style    st/back-btn-touchable
                              :on-press #(dispatch [:navigate-back])}
-        [view st/profile-back-button-container
-         [icon :back st/profile-back-button-icon]]]
+        [view st/back-btn-container
+         [icon :back st/back-btn-icon]]]
        [view st/status-block
         [view st/user-photo-container
          [user-photo  {}]
@@ -74,3 +74,36 @@
          [touchable-opacity {}
           [text {:style st/report-user-text}
            "REPORT USER"]]]]])))
+
+(defn my-profile []
+  (let [username     (subscribe [:username])
+        phone-number (subscribe [:phone-number])
+        email        (subscribe [:email])
+        status       (subscribe [:status])]
+    (fn []
+      [scroll-view {:style st/profile}
+       [touchable-highlight {:style    st/back-btn-touchable
+                             :on-press #(dispatch [:navigate-back])}
+        [view st/back-btn-container
+         [icon :back st/back-btn-icon]]]
+       [touchable-highlight {:style    st/actions-btn-touchable
+                             :on-press (fn []
+                                         ;; TODO not implemented
+                                         )}
+        [view st/actions-btn-container
+         [icon :dots st/actions-btn-icon]]]
+       [view st/status-block
+        [view st/user-photo-container
+         [user-photo  {}]
+         [user-online {:online true}]]
+        [text {:style st/user-name}
+         @username]
+        [text {:style st/status}
+         @status]]
+       [view st/profile-properties-container
+        [profile-property-view {:name "Username"
+                                :value @username}]
+        [profile-property-view {:name "Phone number"
+                                :value @phone-number}]
+        [profile-property-view {:name "Email"
+                                :value @email}]]])))
diff --git a/src/syng_im/components/profile_styles.cljs b/src/syng_im/components/profile_styles.cljs
index 11c58ccf04..347b89c282 100644
--- a/src/syng_im/components/profile_styles.cljs
+++ b/src/syng_im/components/profile_styles.cljs
@@ -68,19 +68,33 @@
    :backgroundColor color-white
    :flexDirection   :column})
 
-(def profile-back-button-touchable
+(def back-btn-touchable
   {:position :absolute})
 
-(def profile-back-button-container
+(def back-btn-container
   {:width  56
    :height 56})
 
-(def profile-back-button-icon
+(def back-btn-icon
   {:marginTop  21
    :marginLeft 23
    :width      8
    :height     14})
 
+(def actions-btn-touchable
+  {:position :absolute
+   :right    0})
+
+(def actions-btn-container
+  {:width          56
+   :height         56
+   :alignItems     :center
+   :justifyContent :center})
+
+(def actions-btn-icon
+  {:width  4
+   :height 16})
+
 (def status-block
   {:alignSelf  :center
    :alignItems :center
diff --git a/src/syng_im/db.cljs b/src/syng_im/db.cljs
index 54280b7d11..27a48ce65d 100644
--- a/src/syng_im/db.cljs
+++ b/src/syng_im/db.cljs
@@ -7,8 +7,7 @@
 (def default-view :chat-list)
 
 ;; initial state of app-db
-(def app-db {:greeting             "Hello Clojure in iOS and Android!"
-             :identity-password    "replace-me-with-user-entered-password"
+(def app-db {:identity-password    "replace-me-with-user-entered-password"
              :identity             "me"
              :contacts             []
              :current-chat-id      "console"
@@ -22,7 +21,11 @@
              :signed-up            false
              :view-id              default-view
              :navigation-stack     (list default-view)
-             :name                 "My Name"
+             ;; TODO fix hardcoded values
+             :username             "My Name"
+             :phone-number         "3147984309"
+             :email                "myemail@gmail.com"
+             :status               "Hi, this is my status"
              :current-tag          nil})
 
 (def protocol-initialized-path [:protocol-initialized])
diff --git a/src/syng_im/handlers.cljs b/src/syng_im/handlers.cljs
index 063c6f67dd..c776b061b6 100644
--- a/src/syng_im/handlers.cljs
+++ b/src/syng_im/handlers.cljs
@@ -457,6 +457,12 @@
       (dispatch [:navigate-to :profile])
       db)))
 
+(register-handler :show-my-profile
+  (fn [db [action]]
+    (log/debug action)
+    (dispatch [:navigate-to :my-profile])
+    db))
+
 ;; -- Chats --------------------------------------------------------------
 
 (register-handler :show-chat
diff --git a/src/syng_im/subs.cljs b/src/syng_im/subs.cljs
index 695001b450..f09e537391 100644
--- a/src/syng_im/subs.cljs
+++ b/src/syng_im/subs.cljs
@@ -94,14 +94,28 @@
 
 ;; -- User data --------------------------------------------------------------
 
-;; (register-sub
-;;   :get-user-phone-number
-;;   (fn [db _]
-;;     (reaction
-;;       (get @db :user-phone-number))))
+(register-sub :username
+  (fn [db _]
+    (reaction
+     (get @db :username))))
+
+(register-sub :phone-number
+  (fn [db _]
+    (reaction
+     (get @db :phone-number))))
+
+(register-sub :email
+  (fn [db _]
+    (reaction
+     (get @db :email))))
+
+(register-sub :status
+  (fn [db _]
+    (reaction
+     (get @db :status))))
 
 (register-sub
-  :get-user-identity
+ :get-user-identity
   (fn [db _]
     (reaction
       (get @db :user-identity))))