Update Freshchat SDK to version 1.1.0

freshworks · Oct 20, 2017 · 1c640ef · 1c640ef
1 parent 78638f0
commit 1c640ef
Show file tree

Hide file tree

Showing 27 changed files with 261 additions and 277 deletions.
diff --git a/freshchat_sdk/LICENSE b/freshchat_sdk/LICENSE
diff --git a/freshchat_sdk/build.gradle b/freshchat_sdk/build.gradle
@@ -3,14 +3,14 @@ apply plugin: 'com.github.dcendents.android-maven'
 group='com.github.freshdesk'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.0"
+    compileSdkVersion 23
+    buildToolsVersion "26.0.2"
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 25
-        versionCode 1
-        versionName "1.0.0"
+        targetSdkVersion 23
+        versionCode 10
+        versionName "1.1.0"
         consumerProguardFiles 'consumer-proguard-rules.pro'
     }
     buildTypes {
@@ -21,10 +21,16 @@ android {
     }
 }
 
+ext {
+    gsonVersion             = '2.8.0'
+    picassoVersion          = '2.5.2'
+    supportLibraryVersion   = '23.4.0'
+}
+
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.android.support:recyclerview-v7:25.3.1'
-    compile 'com.google.code.gson:gson:2.3.1'
-    compile 'com.squareup.picasso:picasso:2.5.2'
+    compile "com.google.code.gson:gson:$gsonVersion"
+    compile "com.squareup.picasso:picasso:$picassoVersion"
+    compile "com.android.support:appcompat-v7:$supportLibraryVersion"
+    compile "com.android.support:recyclerview-v7:$supportLibraryVersion"
 }
diff --git a/freshchat_sdk/libs/freshchat.jar b/freshchat_sdk/libs/freshchat.jar
diff --git a/freshchat_sdk/src/main/AndroidManifest.xml b/freshchat_sdk/src/main/AndroidManifest.xml
@@ -8,6 +8,14 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
+    <!-- [Optional] Freshchat needs RECORD_AUDIO permission to record voice messages -->
+    <!-- Can be removed/negated if voice messaging is disabled -->
+    <!-- <uses-permission android:name="android.permission.RECORD_AUDIO" /> -->
+
+    <!-- [Optional] Freshchat needs external storage access to store voice messages -->
+    <!-- Can be removed/negated if voice messaging is disabled -->
+    <!-- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />  -->
+
     <uses-sdk android:minSdkVersion="16" />
 
     <application>

diff --git a/freshchat_sdk/src/main/res/drawable-v21/freshchat_faq_category_listitem_bg.xml b/freshchat_sdk/src/main/res/drawable-v21/freshchat_faq_category_listitem_bg.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?android:colorControlHighlight">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@color/freshchat_category_normal" />
+            <corners android:radius="8dp" />
+        </shape>
+    </item>
+</ripple>
diff --git a/freshchat_sdk/src/main/res/layout/freshchat_activity_article_list.xml b/freshchat_sdk/src/main/res/layout/freshchat_activity_article_list.xml
@@ -5,7 +5,7 @@
 
     <ListView
         android:id="@+id/list"
-        style="?attr/freshchatArticleListStyle"
+        style="?attr/freshchatFAQListStyle"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_above="@+id/freshchat_contact_us_group" />

diff --git a/freshchat_sdk/src/main/res/layout/freshchat_activity_category_list.xml b/freshchat_sdk/src/main/res/layout/freshchat_activity_category_list.xml
@@ -5,7 +5,7 @@
 
     <android.support.v7.widget.RecyclerView
         android:id="@+id/freshchat_activity_category_list_recycler_view"
-        style="?attr/freshchatCategoryListStyle"
+        style="?attr/freshchatFAQCategoryListStyle"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_above="@+id/freshchat_contact_us_group" />

diff --git a/freshchat_sdk/src/main/res/layout/freshchat_dialog_customer_survey.xml b/freshchat_sdk/src/main/res/layout/freshchat_dialog_customer_survey.xml
@@ -8,7 +8,7 @@
 
     <TextView
         android:id="@+id/freshchat_custsurvey_question_text"
-        style="?attr/freshchatCustomerSurveyQuestionStyle" />
+        style="?attr/freshchatCustomerSurveyQuestionTextStyle" />
 
     <RatingBar
         android:id="@+id/freshchat_custsurvey_rating_bar"
@@ -18,5 +18,5 @@
 
     <EditText
         android:id="@+id/freshchat_custsurvey_user_comment"
-        style="?attr/freshchatCustomerSurveyCommentsEditTextStyle" />
+        style="?attr/freshchatCustomerSurveyCommentsInputViewStyle" />
 </LinearLayout>
diff --git a/freshchat_sdk/src/main/res/layout/freshchat_listitem_article.xml b/freshchat_sdk/src/main/res/layout/freshchat_listitem_article.xml
@@ -11,5 +11,4 @@
     android:paddingTop="10dp"
     android:singleLine="false"
     android:text="Medium Text"
-    android:textAppearance="?attr/freshchatArticleTitleTextAppearance"
-    style="?attr/freshchatArticleListItemStyle"/>
+    style="?attr/freshchatFAQListItemStyle"/>
diff --git a/freshchat_sdk/src/main/res/layout/freshchat_listitem_category.xml b/freshchat_sdk/src/main/res/layout/freshchat_listitem_category.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    style="?attr/freshchatCategoryListItemStyle">
+    style="?attr/freshchatFAQCategoryListItemStyle">
 
     <ImageView
         android:id="@+id/freshchat_category_icon"
@@ -13,12 +13,13 @@
 
     <TextView
         android:id="@+id/freshchat_category_icon_alt_text"
-        style="?attr/freshchatCategoryAltIconStyle"
+        style="?attr/freshchatFAQCategoryAltIconStyle"
         android:layout_centerVertical="true"
         android:visibility="gone" />
 
     <TextView
         android:id="@+id/freshchat_category_name"
+        style="?attr/freshchatFAQCategoryNameTextStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/freshchat_category_icon_size"
@@ -27,11 +28,11 @@
         android:paddingLeft="8dp"
         android:paddingRight="8dp"
         android:paddingTop="12dp"
-        android:textAppearance="?attr/freshchatCategoryNameTextAppearance"
         tools:text="Category Name" />
 
     <TextView
         android:id="@+id/freshchat_category_desc"
+        style="?attr/freshchatFAQCategoryDescriptionTextStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignLeft="@+id/freshchat_category_name"
@@ -40,6 +41,5 @@
         android:maxLines="2"
         android:paddingBottom="8dp"
         android:paddingLeft="8dp"
-        android:paddingRight="8dp"
-        android:textAppearance="?attr/freshchatCategoryDescriptionTextAppearance" />
+        android:paddingRight="8dp" />
 </RelativeLayout>
diff --git a/freshchat_sdk/src/main/res/layout/freshchat_listitem_category_for_grid.xml b/freshchat_sdk/src/main/res/layout/freshchat_listitem_category_for_grid.xml
@@ -5,7 +5,7 @@
     android:layout_height="wrap_content"
     android:orientation="vertical"
     android:padding="8dp"
-    style="?attr/freshchatCategoryListItemStyle">
+    style="?attr/freshchatFAQCategoryListItemStyle">
 
     <ImageView
         android:id="@+id/freshchat_category_icon"
@@ -17,16 +17,16 @@
 
     <TextView
         android:id="@+id/freshchat_category_icon_alt_text"
-        style="?attr/freshchatCategoryAltIconStyle"
+        style="?attr/freshchatFAQCategoryAltIconStyle"
         android:layout_gravity="center_horizontal"
         android:visibility="gone" />
 
     <TextView
         android:id="@+id/freshchat_category_name"
+        style="?attr/freshchatFAQCategoryNameTextStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center"
         android:padding="4dp"
-        android:textAppearance="?attr/freshchatCategoryNameTextAppearance"
         tools:text="Category Name" />
 </LinearLayout>
diff --git a/freshchat_sdk/src/main/res/layout/freshchat_listitem_channel.xml b/freshchat_sdk/src/main/res/layout/freshchat_listitem_channel.xml
@@ -27,29 +27,29 @@
 
         <TextView
             android:id="@+id/freshchat_channel_last_updated"
+            style="?attr/freshchatChannelLastUpdatedAtTextStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignBaseline="@+id/freshchat_channel_name"
             android:layout_alignParentRight="true"
             android:layout_alignTop="@+id/freshchat_channel_name"
             android:layout_marginRight="0dp"
             android:gravity="center"
-            android:textAppearance="?attr/freshchatChannelLastUpdatedTextAppearance"
             android:visibility="gone"
             tools:text="12:45 PM"
             tools:visibility="visible" />
 
         <TextView
             android:id="@+id/freshchat_channel_name"
-            style="@style/Widget.Freshchat.ChannelName"
+            style="?attr/freshchatChannelNameTextStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_toLeftOf="@+id/freshchat_channel_last_updated"
-            android:textAppearance="?attr/freshchatChannelNameTextAppearance"
             tools:text="Channel Name Super Long Text" />
 
         <TextView
             android:id="@+id/freshchat_channel_unread_count"
+            style="?attr/freshchatChannelUnreadCountTextStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignBaseline="@+id/freshchat_channel_desc"
@@ -62,20 +62,18 @@
             android:paddingLeft="8dp"
             android:paddingRight="8dp"
             android:paddingTop="3dp"
-            android:textAppearance="?attr/freshchatChannelUnreadCountTextAppearance"
             android:visibility="gone"
             tools:text="5"
             tools:visibility="visible" />
 
         <TextView
             android:id="@+id/freshchat_channel_desc"
-            style="@style/Widget.Freshchat.ChannelDescription"
+            style="?attr/freshchatChannelDescriptionTextStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignLeft="@+id/freshchat_channel_name"
             android:layout_below="@+id/freshchat_channel_name"
             android:layout_toLeftOf="@+id/freshchat_channel_unread_count"
-            android:textAppearance="?attr/freshchatChannelDescriptionTextAppearance"
             tools:text="This is description of a message channel" />
     </RelativeLayout>
 

diff --git a/freshchat_sdk/src/main/res/layout/freshchat_listitem_message.xml b/freshchat_sdk/src/main/res/layout/freshchat_listitem_message.xml
@@ -11,18 +11,17 @@
         android:id="@+id/freshchat_message_avatar"
         android:layout_width="@dimen/freshchat_message_avatar_icon_size"
         android:layout_height="@dimen/freshchat_message_avatar_icon_size"
-        android:layout_below="@+id/freshchat_message_user_name" />
+        android:layout_below="@+id/freshchat_message_user_name"
+        android:paddingRight="4dp" />
 
     <TextView
         android:id="@+id/freshchat_message_user_name"
+        style="?attr/freshchatTeamMemberNameTextStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_toRightOf="@+id/freshchat_message_avatar"
-        android:lines="1"
         android:paddingLeft="4dp"
         android:paddingTop="4dp"
-        android:text="@string/freshchat_default_agent_name"
-        android:textAppearance="?attr/freshchatAgentNameTextAppearance"
         tools:text="@string/freshchat_default_agent_name" />
 
     <RelativeLayout

diff --git a/freshchat_sdk/src/main/res/layout/freshchat_partial_article_voting_frame.xml b/freshchat_sdk/src/main/res/layout/freshchat_partial_article_voting_frame.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout android:id="@+id/freshchat_voting_view"
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/freshchat_voting_view"
-    android:orientation="vertical"
-    android:visibility="gone"
-    android:layout_alignParentBottom="true"
-    tools:context=".activity.SolutionArticleActivity"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:visibility="gone"
+    style="?attr/freshchatFAQVotingPromptViewStyle"
+    tools:context=".activity.ArticleDetailActivity">
 
     <View
         android:id="@+id/freshchat_voting_view_divider"
@@ -17,7 +16,7 @@
 
     <TextView
         android:id="@+id/freshchat_voting_prompt"
-        style="?attr/freshchatArticleVotingPromptTextStyle"
+        style="?attr/freshchatFAQVotingPromptTextStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 
@@ -28,10 +27,10 @@
 
         <Button
             android:id="@+id/freshchat_upvote"
-            style="?attr/freshchatArticleUpvoteStyle" />
+            style="?attr/freshchatFAQUpvoteButtonStyle" />
 
         <Button
             android:id="@+id/freshchat_downvote"
-            style="?attr/freshchatArticleDownvoteStyle" />
+            style="?attr/freshchatFAQDownvoteButtonStyle" />
     </LinearLayout>
 </LinearLayout>
diff --git a/freshchat_sdk/src/main/res/layout/freshchat_partial_channel_list_empty_frame.xml b/freshchat_sdk/src/main/res/layout/freshchat_partial_channel_list_empty_frame.xml
@@ -5,4 +5,4 @@
     android:padding="16dp"
     android:gravity="center"
     android:text="@string/freshchat_channel_list_empty"
-    android:textAppearance="?attr/freshchatChannelListEmptyWarningTextAppearance" />
+    android:textAppearance="?attr/freshchatChannelListEmptyTextStyle" />
diff --git a/freshchat_sdk/src/main/res/layout/freshchat_partial_chat_resolution_confirmation_frame.xml b/freshchat_sdk/src/main/res/layout/freshchat_partial_chat_resolution_confirmation_frame.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout android:id="@+id/freshchat_chat_resolution_confirmation_layout"
-    style="?attr/freshchatChatResolutionConfirmationPromptViewStyle"
+    style="?attr/freshchatChatResolutionPromptViewStyle"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:visibility="gone"
@@ -14,7 +14,7 @@
 
     <TextView
         android:id="@+id/freshchat_chat_resolution_prompt_tv"
-        style="?attr/freshchatChatResolutionConfirmationPromptTextStyle"
+        style="?attr/freshchatChatResolutionPromptTextStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 

diff --git a/freshchat_sdk/src/main/res/layout/freshchat_partial_faq_list_empty.xml b/freshchat_sdk/src/main/res/layout/freshchat_partial_faq_list_empty.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    style="?attr/freshchatFAQListEmptyTextStyle"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:gravity="center"
     android:padding="16dp"
-    android:text="@string/freshchat_faq_list_empty"
-    android:textAppearance="?attr/freshchatFAQListEmptyWarningTextAppearance" />
+    android:text="@string/freshchat_faq_list_empty" />
diff --git a/freshchat_sdk/src/main/res/layout/freshchat_partial_message_fragment_audio.xml b/freshchat_sdk/src/main/res/layout/freshchat_partial_message_fragment_audio.xml
@@ -31,12 +31,12 @@
 
     <TextView
         android:id="@+id/freshchat_message_duration"
+        style="?attr/freshchatVoiceMessageDurationTextStyle"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
         android:layout_marginRight="4dp"
         tools:text="@string/tools_label_duration"
-        android:textAppearance="?attr/freshchatVoiceMessageDurationTextAppearance"
         android:visibility="gone" />
 </RelativeLayout>
diff --git a/freshchat_sdk/src/main/res/layout/freshchat_partial_message_fragment_button.xml b/freshchat_sdk/src/main/res/layout/freshchat_partial_message_fragment_button.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <Button android:id="@+id/freshchat_button"
-    style="?attr/freshchatMessageDeepLinkStyle"
+    style="?attr/freshchatMessageButtonStyle"
     xmlns:android="http://schemas.android.com/apk/res/android" />