diff --git a/build/intermediates/dex-cache/cache.xml b/build/intermediates/dex-cache/cache.xml
index fba8db8..c974891 100644
--- a/build/intermediates/dex-cache/cache.xml
+++ b/build/intermediates/dex-cache/cache.xml
@@ -1,2 +1,117 @@
-
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
+
diff --git a/faveo-helpdesk-android-app-master.iml b/faveo-helpdesk-android-app-master.iml
new file mode 100644
index 0000000..2849603
--- /dev/null
+++ b/faveo-helpdesk-android-app-master.iml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/faveo/build.gradle b/faveo/build.gradle
index aa29a18..c6847bf 100644
--- a/faveo/build.gradle
+++ b/faveo/build.gradle
@@ -16,10 +16,10 @@ android {
defaultConfig {
applicationId "co.helpdesk.faveo"
- minSdkVersion 14
+ minSdkVersion 16
targetSdkVersion 23
- versionCode 10
- versionName "1.1"
+ versionCode 11
+ versionName "1.2"
}
buildTypes {
release {
diff --git a/faveo/faveo.iml b/faveo/faveo.iml
index 992eb7f..b6a99ff 100644
--- a/faveo/faveo.iml
+++ b/faveo/faveo.iml
@@ -1,5 +1,5 @@
-
+
diff --git a/faveo/src/main/java/co/helpdesk/faveo/frontend/adapters/TicketThreadAdapter.java b/faveo/src/main/java/co/helpdesk/faveo/frontend/adapters/TicketThreadAdapter.java
index 9415b49..186880f 100644
--- a/faveo/src/main/java/co/helpdesk/faveo/frontend/adapters/TicketThreadAdapter.java
+++ b/faveo/src/main/java/co/helpdesk/faveo/frontend/adapters/TicketThreadAdapter.java
@@ -1,15 +1,14 @@
package co.helpdesk.faveo.frontend.adapters;
import android.support.v7.widget.RecyclerView;
-import android.text.Html;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import android.webkit.WebView;
import android.widget.TextView;
import com.makeramen.roundedimageview.RoundedImageView;
import com.squareup.picasso.Picasso;
-
import java.util.List;
import co.helpdesk.faveo.Helper;
@@ -34,7 +33,9 @@ public void onBindViewHolder(final TicketViewHolder ticketViewHolder, int i) {
ticketViewHolder.textViewClientName.setText(ticketThread.clientName);
ticketViewHolder.textViewMessageTime.setText(Helper.parseDate(ticketThread.messageTime));
ticketViewHolder.textViewMessageTitle.setText(ticketThread.messageTitle);
- ticketViewHolder.textViewMessage.setText(Html.fromHtml(ticketThread.message));
+ //ticketViewHolder.textViewMessage.setText(Html.fromHtml(ticketThread.message));
+ ticketViewHolder.webView.loadDataWithBaseURL(null, ticketThread.message, "text/html", "utf-8", null);
+
if (ticketThread.clientPicture != null && ticketThread.clientPicture.trim().length() != 0)
Picasso.with(ticketViewHolder.roundedImageViewProfilePic.getContext())
.load(ticketThread.clientPicture)
@@ -49,10 +50,10 @@ public void onBindViewHolder(final TicketViewHolder ticketViewHolder, int i) {
public void onClick(View v) {
if (ticketViewHolder.textViewMessageTitle.getVisibility() == View.GONE) {
ticketViewHolder.textViewMessageTitle.setVisibility(View.VISIBLE);
- ticketViewHolder.textViewMessage.setVisibility(View.VISIBLE);
+ ticketViewHolder.webView.setVisibility(View.VISIBLE);
} else {
ticketViewHolder.textViewMessageTitle.setVisibility(View.GONE);
- ticketViewHolder.textViewMessage.setVisibility(View.GONE);
+ ticketViewHolder.webView.setVisibility(View.GONE);
}
}
});
@@ -65,8 +66,8 @@ public void onClick(View v) {
@Override
public TicketViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
View itemView = LayoutInflater.
- from(viewGroup.getContext()).
- inflate(R.layout.card_conversation, viewGroup, false);
+ from(viewGroup.getContext()).
+ inflate(R.layout.card_conversation, viewGroup, false);
return new TicketViewHolder(itemView);
}
@@ -77,18 +78,20 @@ public static class TicketViewHolder extends RecyclerView.ViewHolder {
protected TextView textViewClientName;
protected TextView textViewMessageTime;
protected TextView textViewMessageTitle;
- protected TextView textViewMessage;
+ // protected TextView textViewMessage;
protected TextView textViewType;
+ protected WebView webView;
public TicketViewHolder(View v) {
super(v);
thread = v.findViewById(R.id.thread);
- roundedImageViewProfilePic = (RoundedImageView) v.findViewById(R.id.imageView_default_profile);
- textViewClientName = (TextView) v.findViewById(R.id.textView_client_name);
- textViewMessageTime = (TextView) v.findViewById(R.id.textView_ticket_time);
+ roundedImageViewProfilePic = (RoundedImageView) v.findViewById(R.id.imageView_default_profile);
+ textViewClientName = (TextView) v.findViewById(R.id.textView_client_name);
+ textViewMessageTime = (TextView) v.findViewById(R.id.textView_ticket_time);
textViewMessageTitle = (TextView) v.findViewById(R.id.textView_client_message_title);
- textViewMessage = (TextView) v.findViewById(R.id.textView_client_message_body);
+ // textViewMessage = (TextView) v.findViewById(R.id.textView_client_message_body);
textViewType = (TextView) v.findViewById(R.id.textView_type);
+ webView = (WebView) v.findViewById(R.id.webView);
}
}
diff --git a/faveo/src/main/res/layout/card_conversation.xml b/faveo/src/main/res/layout/card_conversation.xml
index a767a7e..5ec55b9 100644
--- a/faveo/src/main/res/layout/card_conversation.xml
+++ b/faveo/src/main/res/layout/card_conversation.xml
@@ -1,99 +1,103 @@
-
+ android:layout_height="match_parent"
+ android:background="@color/colorAccent"
+ android:orientation="vertical">
-
+ android:clickable="true"
+ android:background="#fff"
+ android:focusable="true">
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
+
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="8dp"
+ android:background="@color/grey_200"
+ android:textSize="16sp"
+ android:visibility="gone" />
+
\ No newline at end of file
diff --git a/faveo/src/main/res/mipmap-hdpi/ic_launcher.png b/faveo/src/main/res/mipmap-hdpi/ic_launcher.png
index ff93fba..cae83a6 100644
Binary files a/faveo/src/main/res/mipmap-hdpi/ic_launcher.png and b/faveo/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/faveo/src/main/res/mipmap-mdpi/ic_launcher.png b/faveo/src/main/res/mipmap-mdpi/ic_launcher.png
index ec80a42..2a6b115 100644
Binary files a/faveo/src/main/res/mipmap-mdpi/ic_launcher.png and b/faveo/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/faveo/src/main/res/mipmap-xhdpi/ic_launcher.png b/faveo/src/main/res/mipmap-xhdpi/ic_launcher.png
index e2379a2..807ae23 100644
Binary files a/faveo/src/main/res/mipmap-xhdpi/ic_launcher.png and b/faveo/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/faveo/src/main/res/mipmap-xxhdpi/ic_launcher.png b/faveo/src/main/res/mipmap-xxhdpi/ic_launcher.png
index d1bec4f..7e8de0e 100644
Binary files a/faveo/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/faveo/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/faveo/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/faveo/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000..878ab8d
Binary files /dev/null and b/faveo/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ