From 60ee000b6ccbafa681b95d0ffc6e55eaa9a5ef48 Mon Sep 17 00:00:00 2001
From: jendib <benjamin.gam@gmail.com>
Date: Sun, 22 Nov 2015 20:32:26 +0100
Subject: [PATCH] #45: Android: Add comments

---
 .../docs/activity/DocumentViewActivity.java   |  35 ++++++++++++++
 .../docs/resource/CommentResource.java        |  18 +++++++
 .../drawable-xhdpi/ic_comment_black_24dp.png  | Bin 0 -> 296 bytes
 .../drawable-xhdpi/ic_send_grey600_24dp.png   | Bin 0 -> 448 bytes
 .../drawable-xxhdpi/ic_comment_black_24dp.png | Bin 0 -> 359 bytes
 .../drawable-xxhdpi/ic_send_grey600_24dp.png  | Bin 0 -> 565 bytes
 .../src/main/res/layout/comment_list_item.xml |   2 +-
 .../res/layout/document_view_activity.xml     |  44 +++++++++++++++++-
 .../main/res/menu/document_view_activity.xml  |   2 +-
 .../app/src/main/res/values/strings.xml       |   5 +-
 10 files changed, 102 insertions(+), 4 deletions(-)
 create mode 100644 docs-android/app/src/main/res/drawable-xhdpi/ic_comment_black_24dp.png
 create mode 100644 docs-android/app/src/main/res/drawable-xhdpi/ic_send_grey600_24dp.png
 create mode 100644 docs-android/app/src/main/res/drawable-xxhdpi/ic_comment_black_24dp.png
 create mode 100644 docs-android/app/src/main/res/drawable-xxhdpi/ic_send_grey600_24dp.png

diff --git a/docs-android/app/src/main/java/com/sismics/docs/activity/DocumentViewActivity.java b/docs-android/app/src/main/java/com/sismics/docs/activity/DocumentViewActivity.java
index 1e056730..5076978c 100644
--- a/docs-android/app/src/main/java/com/sismics/docs/activity/DocumentViewActivity.java
+++ b/docs-android/app/src/main/java/com/sismics/docs/activity/DocumentViewActivity.java
@@ -24,6 +24,8 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
@@ -243,6 +245,39 @@ public class DocumentViewActivity extends AppCompatActivity {
             }
         });
 
+        // TODO Delete comment button
+
+        ImageButton imageButton = (ImageButton) findViewById(R.id.addCommentBtn);
+        imageButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                final EditText commentEditText = (EditText) findViewById(R.id.commentEditText);
+                if (commentEditText.getText().length() == 0) {
+                    // No content for the new comment
+                    return;
+                }
+
+                Toast.makeText(DocumentViewActivity.this, R.string.adding_comment, Toast.LENGTH_LONG).show();
+
+                CommentResource.add(DocumentViewActivity.this,
+                        DocumentViewActivity.this.document.optString("id"),
+                        commentEditText.getText().toString(),
+                        new JsonHttpResponseHandler() {
+                    public void onSuccess(int statusCode, Header[] headers, JSONObject response) {
+                        // TODO Send a new comment event and update the adapter properly
+                        // if there is no adapter yet (comments not loaded), do nothing
+                        commentEditText.setText("");
+                        updateComments();
+                    }
+
+                    @Override
+                    public void onAllFailure(int statusCode, Header[] headers, byte[] responseBytes, Throwable throwable) {
+                        Toast.makeText(DocumentViewActivity.this, R.string.comment_add_failure, Toast.LENGTH_LONG).show();
+                    }
+                });
+            }
+        });
+
         // Grab the comments
         updateComments();
 
diff --git a/docs-android/app/src/main/java/com/sismics/docs/resource/CommentResource.java b/docs-android/app/src/main/java/com/sismics/docs/resource/CommentResource.java
index cf7bec0b..ca330ee1 100644
--- a/docs-android/app/src/main/java/com/sismics/docs/resource/CommentResource.java
+++ b/docs-android/app/src/main/java/com/sismics/docs/resource/CommentResource.java
@@ -2,6 +2,7 @@ package com.sismics.docs.resource;
 
 import android.content.Context;
 
+import com.loopj.android.http.RequestParams;
 import com.sismics.docs.listener.JsonHttpResponseHandler;
 
 
@@ -24,6 +25,23 @@ public class CommentResource extends BaseResource {
         client.get(getApiUrl(context) + "/comment/" + documentId, responseHandler);
     }
 
+    /**
+     * PUT /comment.
+     *
+     * @param context Context
+     * @param documentId Document ID
+     * @param content Comment content
+     * @param responseHandler Callback
+     */
+    public static void add(Context context, String documentId, String content, JsonHttpResponseHandler responseHandler) {
+        init(context);
+
+        RequestParams params = new RequestParams();
+        params.put("id", documentId);
+        params.put("content", content);
+        client.put(getApiUrl(context) + "/comment", params, responseHandler);
+    }
+
     /**
      * Cancel pending requests.
      *
diff --git a/docs-android/app/src/main/res/drawable-xhdpi/ic_comment_black_24dp.png b/docs-android/app/src/main/res/drawable-xhdpi/ic_comment_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..412de9b052754c39e9092a17cef71d680f8558f7
GIT binary patch
literal 296
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}a}tg=CK)Uj~LMH3o);76yi2K%s^g
z3=E|}g|8AA7_4S6Fo+k-*%fF5lweBoc6VX;-`;;_Kaj^+;1OBOz`!jG!i)^F=12eq
z7kIijhD02Gd&8Tn#es+A!mgedx?gS9UCHKDdX@BN+v<aoQ4<tbE<76Y_Ort3cMQ`e
zOj_W;uKuQh>*LQKVK#s6vQ6X{$$Bg+QzZW)r12K}oUC{@4Tk;C&L8-};t*zKurWNP
zflcAH41+@S#lMZJ3=Uz;db@ueIKZZ5w&3RvTh;~^)hgA5%l~6javscHz%ZYM(}F{)
lKp;UlLHNm%GEok7>nArq`YfE_wE*Z=22WQ%mvv4FO#lgHWsd*=

literal 0
HcmV?d00001

diff --git a/docs-android/app/src/main/res/drawable-xhdpi/ic_send_grey600_24dp.png b/docs-android/app/src/main/res/drawable-xhdpi/ic_send_grey600_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..e138046223025f5a9422590d78a47b3d4984a4c5
GIT binary patch
literal 448
zcmV;x0YCnUP)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0000WV@Og>004R>
z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN
zS#tmY3ljhU3ljkVnw%H_00B5jL_t(o!|j*RZNe}RKwl68lmVbpnUO_o37l?F!W@Ot
zK}uE#0{Ri95J<3nw!fOoXQDj&*}gkx3(`h50R9tT%aRYObbu2hO5R!VlMVoIWP@g#
z4p7H8I*za_;7oS+t|Z5V3VQ}<gei9E0KvlC0FAH}2RY#4@U=jgA3z{X0`L+h1=PX{
zv`ttDppHG7b-%E1fJN99FyZaynK2d!Q+&DBgE6xfa3U4vT5x>kcOb_!!ekZAKEH}h
zEldh{Z2?|700oM@kD~d_52qGI2199EWZM|~7Fn_8*u72N$JiBrQc@hW*1n0KDilSU
zR8di&AJ1+az!NFq089Q1E18`MEl$yQmLdUoN%3vGyruZGj)pv5>v-S%DybBE`|i*y
q$S)uf`sqHvC(AfehHLBqh#kMS#iSv<*6SGn0000<MNUMnLSTXtpQ~yB

literal 0
HcmV?d00001

diff --git a/docs-android/app/src/main/res/drawable-xxhdpi/ic_comment_black_24dp.png b/docs-android/app/src/main/res/drawable-xxhdpi/ic_comment_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..382ee7a14b35e9c1c2c24075b028d33e356fa11b
GIT binary patch
literal 359
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw6p}rHd>I(3)EF2VS{N990fib~
zFff!FFfhDIU|_JC!N4G1FlSew4N!t9$=lt9;eUJonf*W>XMsm#F#`j)FbFd;%$g$s
z6uj^0;uw-~@9j-*z9s_+*N4V|-xQ=voKo0#nY+6rU1+sXH2kq9IB-JamcO3wc1r)a
zWb$&sf+<{g=kzp5J+I_dwfwB;=k;{%r+r;V-(TiDU1;&`%rD2tg1*BW->{1YI^3=c
zkYz1-#lBM`n?=ZD!Nq$gI~(+vI7Q^1lr!<Z&3ennsWQP~U%7Bb&4l~bDi@wOls6t@
z|2fxz>F@62Ee^e=0hzp0qM21?avK$%CUCQGYM0GnZkqS;-y^eY4tJNVSfCe_a=~2F
z>c!*~hAV0_8Mb;xC@1!|m<nC<I2N^d3fB$pAKdpH1AcDu0eY3e)78&qol`;+0H4x^
AHUIzs

literal 0
HcmV?d00001

diff --git a/docs-android/app/src/main/res/drawable-xxhdpi/ic_send_grey600_24dp.png b/docs-android/app/src/main/res/drawable-xxhdpi/ic_send_grey600_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..2c7a80266242bf7f54b74bcb9cbe98281e7f2088
GIT binary patch
literal 565
zcmV-50?Pe~P)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0000WV@Og>004R>
z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN
zS#tmY3ljhU3ljkVnw%H_00FH@L_t(&-tF02Zh}w{fZ^Z91=I!9ChZ!#5l9regNo~@
ztuCap1xzmwgjACP=Q1;r=HRO)U*-ql9A-~U>zE}_0wquaO$xMQ#S6`JK%d-D^URu$
z>3{%EY{}V82h<)1a{GWoAb^^Z!ZP3(s0*0!b`8)Mv)*qS1#|})1@r?M1oQ_f2Mh(N
z1-t}(d;eZMU@S;HpbV%BxaK$=P#dr!j|(UZYL7iRo6vw7ps0Xapx}U-prC;IAkTm{
zpe|s>yB}!5!`Wxa+&<vYGHA~70=TdU=(8@9oL_Ii@P(qp{Qd|iw{i`g-;t8yH=x#1
z+HZah+b*CU=>7t9I|8c6*h?pSJOkW$Br7PWB~EIe8T6gh85>UFmwng_Mk4wAF~-lp
z;kp{Wb;!-2KT_p>>(IQp_C~q}XfTrf1KLO=J5WPKKK=w`1M-Muu?+HxqzMX&qy-9&
zqydUrt4eRjIISgYHmr`6l)4*M?jXTPu^{nCF`$}4K2j*?K&BIE2-Np#K{b*e$RLtC
z$S9HvNMQ3)4rKm@YzXwq%080R?neS8Py!{;KLz~&$HDh8V7w~v00000NkvXXu0mjf
D^l|4S

literal 0
HcmV?d00001

diff --git a/docs-android/app/src/main/res/layout/comment_list_item.xml b/docs-android/app/src/main/res/layout/comment_list_item.xml
index 7396aac6..eb444391 100644
--- a/docs-android/app/src/main/res/layout/comment_list_item.xml
+++ b/docs-android/app/src/main/res/layout/comment_list_item.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:padding="12dp"
     android:background="?android:attr/selectableItemBackground">
diff --git a/docs-android/app/src/main/res/layout/document_view_activity.xml b/docs-android/app/src/main/res/layout/document_view_activity.xml
index 7a0d3cf9..b437c238 100644
--- a/docs-android/app/src/main/res/layout/document_view_activity.xml
+++ b/docs-android/app/src/main/res/layout/document_view_activity.xml
@@ -52,13 +52,22 @@
         <!-- Comments -->
 
         <TextView
+            android:drawableStart="@drawable/ic_comment_black_24dp"
+            android:drawableLeft="@drawable/ic_comment_black_24dp"
+            android:drawablePadding="6dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textSize="16sp"
+            android:gravity="center"
             android:textColor="@color/primary_text_default_material_light"
             android:text="@string/comments"
             android:layout_margin="12dp"/>
 
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="#eee"/>
+
         <ListView
             android:layout_weight="1"
             android:id="@+id/commentListView"
@@ -89,12 +98,45 @@
             android:visibility="gone"
             android:padding="12dp"
             android:gravity="center"
+            android:layout_weight="1"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="0dp"
             android:fontFamily="sans-serif-light"
             android:text="@string/no_comments"
             android:textSize="14sp"/>
 
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="#eee"/>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:padding="6dp"
+            android:gravity="center">
+
+            <EditText
+                android:id="@+id/commentEditText"
+                android:layout_weight="1"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:lines="1"
+                android:inputType="text"
+                android:hint="@string/add_comment"
+                android:maxLength="4000"/>
+
+            <ImageButton
+                android:id="@+id/addCommentBtn"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:src="@drawable/ic_send_grey600_24dp"
+                android:contentDescription="@string/send"
+                android:background="?android:selectableItemBackground"/>
+        </LinearLayout>
+
     </LinearLayout>
 
     <!-- Right drawer -->
diff --git a/docs-android/app/src/main/res/menu/document_view_activity.xml b/docs-android/app/src/main/res/menu/document_view_activity.xml
index bcf880e0..66ca28bf 100644
--- a/docs-android/app/src/main/res/menu/document_view_activity.xml
+++ b/docs-android/app/src/main/res/menu/document_view_activity.xml
@@ -12,7 +12,7 @@
     <item
         android:id="@+id/comments"
         app:showAsAction="collapseActionView"
-        android:title="@string/show_comments">
+        android:title="@string/comments">
     </item>
 
     <item
diff --git a/docs-android/app/src/main/res/values/strings.xml b/docs-android/app/src/main/res/values/strings.xml
index dd7010fc..13c8e106 100644
--- a/docs-android/app/src/main/res/values/strings.xml
+++ b/docs-android/app/src/main/res/values/strings.xml
@@ -107,10 +107,13 @@
     <string name="all_languages">All languages</string>
     <string name="toggle_informations">Toggle informations</string>
     <string name="who_can_access">Who can access</string>
-    <string name="show_comments">Show comments</string>
     <string name="comments">Comments</string>
     <string name="no_comments">No comments</string>
     <string name="error_loading_comments">Error loading comments</string>
+    <string name="send">Send</string>
+    <string name="add_comment">Add a comment</string>
+    <string name="comment_add_failure">Error adding a comment</string>
+    <string name="adding_comment">Adding a comment...</string>
 
 
 </resources>