v1.2

ladybirdweb · Aug 11, 2016 · 70fc977 · 70fc977
1 parent b2bcf1c
commit 70fc977
Show file tree

Hide file tree

Showing 11 changed files with 241 additions and 100 deletions.
diff --git a/build/intermediates/dex-cache/cache.xml b/build/intermediates/dex-cache/cache.xml
@@ -1,2 +1,117 @@
 <?xml version="1.0" encoding="utf-8"?>
-<items version="2" />
+<items version="2" >
+
+    <item
+        jar="/Users/narendra/Downloads/faveo-helpdesk-android-app-master/faveo/build/intermediates/exploded-aar/com.crashlytics.sdk.android/crashlytics-core/2.3.10/jars/classes.jar"
+        jumboMode="false"
+        revision="23.0.3"
+        sha1="2f9a9b21b70965cde70f6eb8f2ee68794fb482e6">
+        <dex dex="/Users/narendra/Downloads/faveo-helpdesk-android-app-master/faveo/build/intermediates/pre-dexed/debug/com.crashlytics.sdk.android-crashlytics-core-2.3.10_225e82c22ad70fc3b1b3c387bb85cec1ef70522b.jar" />
+    </item>
+    <item
+        jar="/Users/narendra/Downloads/faveo-helpdesk-android-app-master/faveo/build/intermediates/exploded-aar/io.fabric.sdk.android/fabric/1.3.12/jars/classes.jar"
+        jumboMode="false"
+        revision="23.0.3"
+        sha1="3575e73a22dce98f0bdbcdb475ef55a84606a9a6">
+        <dex dex="/Users/narendra/Downloads/faveo-helpdesk-android-app-master/faveo/build/intermediates/pre-dexed/debug/io.fabric.sdk.android-fabric-1.3.12_8ef321790a700e37f23e1e607709bdb26e696a4d.jar" />
+    </item>
+    <item
+        jar="/Users/narendra/Downloads/faveo-helpdesk-android-app-master/faveo/build/intermediates/exploded-aar/com.crashlytics.sdk.android/beta/1.2.0/jars/classes.jar"
+        jumboMode="false"
+        revision="23.0.3"
+        sha1="35584aa0ef1d87109a997cfed2662801f304a3c0">
+        <dex dex="/Users/narendra/Downloads/faveo-helpdesk-android-app-master/faveo/build/intermediates/pre-dexed/debug/com.crashlytics.sdk.android-beta-1.2.0_9f0178f33f2ea000b46c5513eb3d706ab758052a.jar" />
+    </item>
+    <item
+        jar="/Users/narendra/Downloads/faveo-helpdesk-android-app-master/faveo/build/intermediates/exploded-aar/com.android.support/cardview-v7/23.1.1/jars/classes.jar"
+        jumboMode="false"
+        revision="23.0.3"
+        sha1="5e412e954a24c5310a459c09870e4e2081aceb03">
+        <dex dex="/Users/narendra/Downloads/faveo-helpdesk-android-app-master/faveo/build/intermediates/pre-dexed/debug/com.android.support-cardview-v7-23.1.1_21404f9931c76e7330a2b5dea4e34aa147c14bf1.jar" />
+    </item>
+    <item
+        jar="/Users/narendra/Downloads/faveo-helpdesk-android-app-master/faveo/build/intermediates/exploded-aar/com.github.rahatarmanahmed/circularprogressview/2.4.0/jars/classes.jar"
+        jumboMode="false"
+        revision="23.0.3"
+        sha1="9a883402815cf6ab7b526e84bbd1d8752f075cd3">
+        <dex dex="/Users/narendra/Downloads/faveo-helpdesk-android-app-master/faveo/build/intermediates/pre-dexed/debug/com.github.rahatarmanahmed-circularprogressview-2.4.0_c8165898a2a74abcf8df53edf26f2940371acf8e.jar" />
+    </item>
+    <item
+        jar="/Users/narendra/Library/Android/sdk/extras/android/m2repository/com/android/support/support-annotations/23.1.1/support-annotations-23.1.1.jar"
+        jumboMode="false"
+        revision="23.0.3"
+        sha1="8d680ba5a623724d1fb0e81c36a790f023a6cede">
+        <dex dex="/Users/narendra/Downloads/faveo-helpdesk-android-app-master/faveo/build/intermediates/pre-dexed/debug/support-annotations-23.1.1_48a9d6bcdd39d6ce3b8d63b965db51ebe2c75f2d.jar" />
+    </item>
+    <item
+        jar="/Users/narendra/Downloads/faveo-helpdesk-android-app-master/faveo/build/intermediates/exploded-aar/com.makeramen/roundedimageview/2.2.1/jars/classes.jar"
+        jumboMode="false"
+        revision="23.0.3"
+        sha1="814fc0c3ec69a944add398217d90077301501a74">
+        <dex dex="/Users/narendra/Downloads/faveo-helpdesk-android-app-master/faveo/build/intermediates/pre-dexed/debug/com.makeramen-roundedimageview-2.2.1_4d2d705f67421b416b44c5f58ada1e554008cb0b.jar" />
+    </item>
+    <item
+        jar="/Users/narendra/Downloads/faveo-helpdesk-android-app-master/faveo/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/jars/classes.jar"
+        jumboMode="false"
+        revision="23.0.3"
+        sha1="6cbc7773921fcfedbe55657578f0cbfe614778dc">
+        <dex dex="/Users/narendra/Downloads/faveo-helpdesk-android-app-master/faveo/build/intermediates/pre-dexed/debug/com.android.support-support-v4-23.1.1_267f66bca33d8a7b57832840a9f0ed6c98e72d33.jar" />
+    </item>
+    <item
+        jar="/Users/narendra/Downloads/faveo-helpdesk-android-app-master/faveo/build/intermediates/exploded-aar/com.crashlytics.sdk.android/crashlytics/2.6.0/jars/classes.jar"
+        jumboMode="false"
+        revision="23.0.3"
+        sha1="32246804c761c812b32f01ea7ec7343622d0d91c">
+        <dex dex="/Users/narendra/Downloads/faveo-helpdesk-android-app-master/faveo/build/intermediates/pre-dexed/debug/com.crashlytics.sdk.android-crashlytics-2.6.0_a56a22e1dc10a9ef7a786bb29834be68fc96fe53.jar" />
+    </item>
+    <item
+        jar="/Users/narendra/Downloads/faveo-helpdesk-android-app-master/faveo/build/intermediates/exploded-aar/com.crashlytics.sdk.android/answers/1.3.8/jars/classes.jar"
+        jumboMode="false"
+        revision="23.0.3"
+        sha1="0c46a5a897439810b6c437ce188bd07d9d8dffb0">
+        <dex dex="/Users/narendra/Downloads/faveo-helpdesk-android-app-master/faveo/build/intermediates/pre-dexed/debug/com.crashlytics.sdk.android-answers-1.3.8_e86d731f329c24a992e61ae55b3efbad4db6e92b.jar" />
+    </item>
+    <item
+        jar="/Users/narendra/Downloads/faveo-helpdesk-android-app-master/faveo/build/intermediates/exploded-aar/com.android.support/design/23.1.1/jars/classes.jar"
+        jumboMode="false"
+        revision="23.0.3"
+        sha1="379471b2bd17d9737c050345c08e8c7d16589784">
+        <dex dex="/Users/narendra/Downloads/faveo-helpdesk-android-app-master/faveo/build/intermediates/pre-dexed/debug/com.android.support-design-23.1.1_7b92b24f9c179b8aae66196e8984e91b8dfc2573.jar" />
+    </item>
+    <item
+        jar="/Users/narendra/Downloads/faveo-helpdesk-android-app-master/faveo/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.1.1/jars/classes.jar"
+        jumboMode="false"
+        revision="23.0.3"
+        sha1="09c5e804bc67fc0580360043dff067df574a60d4">
+        <dex dex="/Users/narendra/Downloads/faveo-helpdesk-android-app-master/faveo/build/intermediates/pre-dexed/debug/com.android.support-recyclerview-v7-23.1.1_1b3841012fc75dcb29f0705e75476fcb9e882930.jar" />
+    </item>
+    <item
+        jar="/Users/narendra/Downloads/faveo-helpdesk-android-app-master/faveo/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/jars/libs/internal_impl-23.1.1.jar"
+        jumboMode="false"
+        revision="23.0.3"
+        sha1="a4de9c81ae239414e1ed0f86441b02abaf29bca9">
+        <dex dex="/Users/narendra/Downloads/faveo-helpdesk-android-app-master/faveo/build/intermediates/pre-dexed/debug/internal_impl-23.1.1_1cecf0b14260f3d416366f431935d55c227998aa.jar" />
+    </item>
+    <item
+        jar="/Users/narendra/Downloads/faveo-helpdesk-android-app-master/faveo/build/intermediates/exploded-aar/com.github.ozodrukh/CircularReveal/1.3.1/jars/classes.jar"
+        jumboMode="false"
+        revision="23.0.3"
+        sha1="4e01297e21f918ce3de5f20f1b7ab5682f125ff4">
+        <dex dex="/Users/narendra/Downloads/faveo-helpdesk-android-app-master/faveo/build/intermediates/pre-dexed/debug/com.github.ozodrukh-CircularReveal-1.3.1_6006e073446811fa0e67b733d51b6bf14b0a66ce.jar" />
+    </item>
+    <item
+        jar="/Users/narendra/Downloads/faveo-helpdesk-android-app-master/faveo/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.1/jars/classes.jar"
+        jumboMode="false"
+        revision="23.0.3"
+        sha1="5c5699834e9722f1c288fea2de82725d078ba127">
+        <dex dex="/Users/narendra/Downloads/faveo-helpdesk-android-app-master/faveo/build/intermediates/pre-dexed/debug/com.android.support-appcompat-v7-23.1.1_0fec8942e7754a0461209ab07df92f6436c32008.jar" />
+    </item>
+    <item
+        jar="/Users/narendra/.gradle/caches/modules-2/files-2.1/com.squareup.picasso/picasso/2.5.2/7446d06ec8d4f7ffcc53f1da37c95f200dcb9387/picasso-2.5.2.jar"
+        jumboMode="false"
+        revision="23.0.3"
+        sha1="7446d06ec8d4f7ffcc53f1da37c95f200dcb9387">
+        <dex dex="/Users/narendra/Downloads/faveo-helpdesk-android-app-master/faveo/build/intermediates/pre-dexed/debug/picasso-2.5.2_25088ab90857acbab8c1c3d8e06c26e764daeb77.jar" />
+    </item>
+
+</items>
diff --git a/faveo-helpdesk-android-app-master.iml b/faveo-helpdesk-android-app-master.iml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="faveo-helpdesk-android-app-master" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="java-gradle" name="Java-Gradle">
+      <configuration>
+        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
+        <option name="BUILDABLE" value="false" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
diff --git 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
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":faveo" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="faveo-helpdesk-android-app-fork" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":faveo" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="faveo-helpdesk-android-app-master" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>

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
@@ -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);
         }
 
     }