Merge remote-tracking branch 'origin/master'

JoinTheCityAPP/app/src/main/java/anotherlineofcode/com/jointhecityapp/discussion_support/ChatActivity.java

 package anotherlineofcode.com.jointhecityapp.discussion_support;
 
+import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
 import android.view.View;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.EditText;
 
@@ -63,9 +65,14 @@ public class ChatActivity extends BaseActivityWithMenu {
         sendMessageButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
+                InputMethodManager imm = (InputMethodManager) view.getContext()
+                        .getSystemService(Context.INPUT_METHOD_SERVICE);
+                imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
+
                 EditText editText = (EditText)findViewById(R.id.messageEdit);
 
                 String message = editText.getText().toString();
+                editText.setText("");
                 sendMessage(message);
                 getMessages();
             }
@@ -141,7 +148,7 @@ public class ChatActivity extends BaseActivityWithMenu {
         requestParams.put("text", text);
         requestParams.put("user", "Default user");
 
-        client.post(getString(R.string.api_url) + "/api/text_message/", new AsyncHttpResponseHandler(){
+        client.post(mDiscussionInfoLink + "add", new AsyncHttpResponseHandler(){
 
             @Override
             public void onSuccess(int statusCode, Header[] headers, byte[] responseBody) {
@@ -151,6 +158,7 @@ public class ChatActivity extends BaseActivityWithMenu {
             @Override
             public void onFailure(int statusCode, Header[] headers, byte[] responseBody, Throwable error) {
                 Log.i("info", "Message wasn't sent to server");
+                Log.i("error", "Error: " + error.toString());
             }
         });
     }

JoinTheCityAPP/app/src/main/java/anotherlineofcode/com/jointhecityapp/discussion_support/MessageViewAdapter.java

@@ -43,6 +43,7 @@ public class MessageViewAdapter extends RecyclerView.Adapter<MessageViewAdapter.
 
     @Override
     public MessageViewAdapter.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+
         View v = LayoutInflater.from(parent.getContext())
                 .inflate(R.layout.discussion_list_view, parent, false);
         ViewHolder vh = new ViewHolder((LinearLayout)v);

JoinTheCityAPP/app/src/main/res/layout/activity_login_and_registration.xml

@@ -5,10 +5,8 @@
     android:paddingTop="@dimen/activity_vertical_margin"
     android:paddingBottom="@dimen/activity_vertical_margin"
     android:orientation="vertical"
-
     tools:context="anotherlineofcode.com.jointhecityapp.LoginAndRegistrationActivity">
     <!--android:background="@drawable/background"-->
-
     <ImageView android:id="@+id/logo"
         android:src="@drawable/logo"
         android:layout_width="200dp"