Merge pull request #28 from timigod/dev

Sync Dev and Master branches
timigod · Jul 6, 2018 · 65b03f2 · 65b03f2
2 parents 5f871fd + f1e7e0e
commit 65b03f2
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 25 deletions.
diff --git a/README.md b/README.md
@@ -67,8 +67,9 @@ chatview:inputUseEditorAction="" // true or false
 chatview:inputTextAppearance=""
 chatview:inputTextSize=""
 chatview:inputTextColor=""
+chatview:inputHint=""
 chatview:inputHintColor=""
-chatview:sendBtnIcon="" 
+chatview:sendBtnIcon=""
 chatview:sendBtnIconTint=""
 chatview:sendBtnBackgroundTint=""
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -24,5 +24,5 @@ dependencies {
     testCompile 'junit:junit:4.12'
 
     compile 'com.android.support:appcompat-v7:23.4.0'
-    compile 'co.intentservice.android-chat-ui:chat-ui:0.1.1'
+    compile project(':chat-ui')
 }
diff --git a/app/src/main/java/co/intentservice/chatui/sample/MainActivity.java b/app/src/main/java/co/intentservice/chatui/sample/MainActivity.java
@@ -15,6 +15,8 @@ protected void onCreate(Bundle savedInstanceState) {
 
         ChatView chatView = (ChatView) findViewById(R.id.chat_view);
         chatView.addMessage(new ChatMessage("Message received", System.currentTimeMillis(), ChatMessage.Type.RECEIVED));
+        chatView.addMessage(new ChatMessage("A message with a sender name",
+                System.currentTimeMillis(), ChatMessage.Type.RECEIVED, "Ryan Java"));
         chatView.setOnSentMessageListener(new ChatView.OnSentMessageListener() {
             @Override
             public boolean sendMessage(ChatMessage chatMessage) {

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -1,22 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:chatview="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
+              xmlns:chatview="http://schemas.android.com/apk/res-auto"
+              xmlns:tools="http://schemas.android.com/tools"
 
-    style="@style/Widget.AppCompat.ButtonBar"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center_horizontal"
-    android:orientation="vertical"
-    tools:context="co.intentservice.chatui.sample.MainActivity">
+              style="@style/Widget.AppCompat.ButtonBar"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:gravity="center_horizontal"
+              android:orientation="vertical"
+              tools:context="co.intentservice.chatui.sample.MainActivity">
 
     <co.intentservice.chatui.ChatView
-        android:id="@+id/chat_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        chatview:backgroundColor="@color/off_white"
-        chatview:bubbleElevation="elevated"
-        chatview:bubbleBackgroundRcv="@color/blue"
-        chatview:bubbleBackgroundSend="@color/white" />
+            android:id="@+id/chat_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            chatview:backgroundColor="@color/off_white"
+            chatview:bubbleElevation="elevated"
+            chatview:bubbleBackgroundRcv="@color/blue"
+            chatview:bubbleBackgroundSend="@color/white"
+            chatview:inputHint="@string/start_typing"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,5 +1,6 @@
 <resources>
 
     <string name="app_name">Android ChatView Sample</string>
+    <string name="start_typing">Start typing</string>
 
 </resources>
diff --git a/chat-ui/src/main/java/co/intentservice/chatui/ChatView.java b/chat-ui/src/main/java/co/intentservice/chatui/ChatView.java
@@ -46,7 +46,7 @@ public class ChatView extends RelativeLayout {
     private ViewBuilderInterface viewBuilder;
     private FloatingActionsMenu actionsMenu;
     private boolean previousFocusState = false, useEditorAction, isTyping;
-
+    private TypingListener typingListener;
     private Runnable typingTimerRunnable = new Runnable() {
         @Override
         public void run() {
@@ -56,10 +56,10 @@ public void run() {
             }
         }
     };
-    private TypingListener typingListener;
     private OnSentMessageListener onSentMessageListener;
     private ChatViewListAdapter chatViewListAdapter;
 
+    private String inputHint;
     private int inputFrameBackgroundColor, backgroundColor;
     private int inputTextSize, inputTextColor, inputHintColor;
     private int sendButtonBackgroundTint, sendButtonIconTint;
@@ -72,8 +72,6 @@ public void run() {
     private TypedArray attributes, textAppearanceAttributes;
     private Context context;
 
-
-
     ChatView(Context context) {
         this(context, null);
     }
@@ -94,7 +92,6 @@ public ChatView(Context context, AttributeSet attrs, int defStyleAttr, ViewBuild
 
     }
 
-
     private void init(Context context, AttributeSet attrs, int defStyleAttr) {
         LayoutInflater.from(getContext()).inflate(R.layout.chat_view, this, true);
         this.context = context;
@@ -131,7 +128,6 @@ private void setListAdapter() {
         chatListView.setAdapter(chatViewListAdapter);
     }
 
-
     private void setViewAttributes() {
         setChatViewBackground();
         setInputFrameAttributes();
@@ -150,7 +146,6 @@ private void getAttributesForChatMessageRow() {
     }
 
     private void getAttributesForBubbles() {
-
         float dip4 = context.getResources().getDisplayMetrics().density * 4.0f;
         int elevation = attributes.getInt(R.styleable.ChatView_bubbleElevation, ELEVATED);
         bubbleElevation = elevation == ELEVATED ? dip4 : 0;
@@ -184,12 +179,16 @@ private void getAttributesForInputText() {
         overrideTextStylesIfSetIndividually();
     }
 
+
     private void setTextAppearanceAttributes() {
         final int textAppearanceId = attributes.getResourceId(R.styleable.ChatView_inputTextAppearance, 0);
         textAppearanceAttributes = getContext().obtainStyledAttributes(textAppearanceId, R.styleable.ChatViewInputTextAppearance);
     }
 
     private void setInputTextAttributes() {
+        if (inputHint != null) {
+            inputEditText.setHint(inputHint);
+        }
         inputEditText.setTextColor(inputTextColor);
         inputEditText.setHintTextColor(inputHintColor);
         inputEditText.setTextSize(TypedValue.COMPLEX_UNIT_PX, inputTextSize);
@@ -229,6 +228,7 @@ private void setInputTextDefaults() {
         inputTextSize = context.getResources().getDimensionPixelSize(R.dimen.default_input_text_size);
         inputTextColor = ContextCompat.getColor(context, R.color.black);
         inputHintColor = ContextCompat.getColor(context, R.color.main_color_gray);
+        setInputHint();
     }
 
     private void setInputTextSize() {
@@ -243,6 +243,12 @@ private void setInputTextColor() {
         }
     }
 
+    public void setInputHint() {
+        if (attributes.hasValue(R.styleable.ChatView_inputHint)) {
+            inputHint = attributes.getString(R.styleable.ChatView_inputHint);
+        }
+    }
+
     private void setInputHintColor() {
         if (textAppearanceAttributes.hasValue(R.styleable.ChatView_inputHintColor)) {
             inputHintColor = attributes.getColor(R.styleable.ChatView_inputHintColor, inputHintColor);
@@ -392,6 +398,7 @@ public EditText getInputEditText() {
         return inputEditText;
     }
 
+
     public FloatingActionsMenu getActionsMenu() {
         return actionsMenu;
     }

diff --git a/chat-ui/src/main/res/layout/chat_view.xml b/chat-ui/src/main/res/layout/chat_view.xml
@@ -10,9 +10,10 @@
         android:id="@+id/chat_list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:layout_above="@+id/input_frame"
         android:clipToPadding="false"
         android:divider="@android:color/transparent"
-        android:paddingBottom="96dp"
+        android:paddingBottom="32dp"
         android:paddingTop="8dp"
         android:stackFromBottom="true"
         android:transcriptMode="alwaysScroll" />

diff --git a/chat-ui/src/main/res/values/attrs.xml b/chat-ui/src/main/res/values/attrs.xml
@@ -8,6 +8,7 @@
         <attr name="inputTextAppearance" format="reference" />
         <attr name="inputTextSize" format="dimension" />
         <attr name="inputTextColor" format="color" />
+        <attr name="inputHint" format="string" />
         <attr name="inputHintColor" format="color" />
 
         <attr name="sendBtnIcon" format="reference" />