Skip to content

Commit

Permalink
Update Freshchat SDK to version to 5.9.0
Browse files Browse the repository at this point in the history
  • Loading branch information
BinduMCX committed Jun 29, 2023
1 parent 89a4794 commit cf633db
Show file tree
Hide file tree
Showing 26 changed files with 531 additions and 57 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## 5.9.0(2023-06-29)

### Feature
* This version will now let you receive star-based feedback from your customers. Customers will be able to provide feedback from a maximum of 5 star based choices.
* We are adding support for Date and time as a new input type for your customers. Customers will now be able to pick a date and pick a time within the bot flow.
* We are adding support for Multi-select as a new input type for your customers. Customers will now be able to pick and choose multiple choices that appears as a dropdown.

## 5.8.0(2023-06-20)

### Feature
Expand Down
7 changes: 7 additions & 0 deletions freshchat_sdk/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## 5.9.0(2023-06-29)

### Feature
* This version will now let you receive star-based feedback from your customers. Customers will be able to provide feedback from a maximum of 5 star based choices.
* We are adding support for Date and time as a new input type for your customers. Customers will now be able to pick a date and pick a time within the bot flow.
* We are adding support for Multi-select as a new input type for your customers. Customers will now be able to pick and choose multiple choices that appears as a dropdown.

## 5.8.0(2023-06-20)

### Feature
Expand Down
4 changes: 2 additions & 2 deletions freshchat_sdk/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ android {

defaultConfig {
minSdkVersion 16
versionCode 580
versionName "5.8.0"
versionCode 590
versionName "5.9.0"
targetSdkVersion 31
consumerProguardFiles 'consumer-proguard-rules.pro'
buildConfigField "long", 'BUILT_AT', System.currentTimeMillis() + 'L'
Expand Down
Binary file modified freshchat_sdk/libs/freshchat.jar
Binary file not shown.
5 changes: 5 additions & 0 deletions freshchat_sdk/src/main/res/color/freshchat_checkbox_color.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/freshchat_black" android:state_checked="false" />
<item android:color="@color/freshchat_drop_down_hint_text_color" android:state_checked="true" />
</selector>
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/freshchat_calendar_next_button_text_disabled" android:state_enabled="false" />
<item android:color="@color/freshchat_drop_down_hint_text_color"/>
</selector>
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="#1412344D">
<item>
<shape android:shape="oval">
<solid android:color="@color/freshchat_white" />
</shape>
</item>
</ripple>
8 changes: 8 additions & 0 deletions freshchat_sdk/src/main/res/drawable/freshchat_checkbox_bg.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item android:drawable="@drawable/freshchat_checkbox_unselected"
android:state_checked="false"/>
<item android:drawable="@drawable/freshchat_checkbox_selected"
android:state_checked="true"/>
<item android:drawable="@drawable/freshchat_checkbox_unselected"/>
</selector>
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<vector android:autoMirrored="true" android:height="24dp"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#2C5CC5" android:pathData="M6.4,4L18.4,4A2.4,2.4 0,0 1,20.8 6.4L20.8,18.4A2.4,2.4 0,0 1,18.4 20.8L6.4,20.8A2.4,2.4 0,0 1,4 18.4L4,6.4A2.4,2.4 0,0 1,6.4 4z"/>
<path android:fillColor="#ffffff" android:pathData="M8.9539,11.7589C8.5744,11.4063 7.9763,11.4231 7.618,11.7965C7.2596,12.1699 7.2767,12.7585 7.6561,13.1112L10.4911,15.7462C10.8706,16.0988 11.4687,16.082 11.827,15.7086L17.182,10.1286C17.5404,9.7552 17.5233,9.1666 17.1439,8.8139C16.7644,8.4613 16.1663,8.4781 15.808,8.8515L11.1018,13.7554L8.9539,11.7589Z"/>
</vector>
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<vector android:autoMirrored="true" android:height="24dp"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillAlpha="0.01" android:fillColor="#ffffff" android:pathData="M0,0h24v24h-24z"/>
<group>
<clip-path android:pathData="M3.6,3.6h16.8v16.8h-16.8z"/>
<path android:fillColor="#ffffff" android:pathData="M6,3.6L18,3.6A2.4,2.4 0,0 1,20.4 6L20.4,18A2.4,2.4 0,0 1,18 20.4L6,20.4A2.4,2.4 0,0 1,3.6 18L3.6,6A2.4,2.4 0,0 1,6 3.6z"/>
<path android:fillColor="#00000000"
android:pathData="M6,4.2L18,4.2A1.8,1.8 0,0 1,19.8 6L19.8,18A1.8,1.8 0,0 1,18 19.8L6,19.8A1.8,1.8 0,0 1,4.2 18L4.2,6A1.8,1.8 0,0 1,6 4.2z"
android:strokeColor="#475867" android:strokeWidth="1.2"/>
</group>
</vector>
21 changes: 12 additions & 9 deletions freshchat_sdk/src/main/res/drawable/freshchat_drop_down_box_bg.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="#1412344D">
<item>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">

<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">

<stroke
android:width="1dp"
android:color="@color/freshchat_drop_down_border_color" />
<solid android:color="@color/freshchat_white" />

</shape>
<solid android:color="@color/freshchat_white" />
<corners
android:topLeftRadius="10dp"
android:topRightRadius="10dp" />
</shape>
</item>
</ripple>
10 changes: 10 additions & 0 deletions freshchat_sdk/src/main/res/drawable/freshchat_ic_bot_calendar.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M17.76,4.104H17.148V3.84C17.148,3.376 16.772,3 16.308,3C15.844,3 15.468,3.376 15.468,3.84V4.104H8.532V3.84C8.532,3.376 8.156,3 7.692,3C7.228,3 6.852,3.376 6.852,3.84V4.104H6.24C4.451,4.104 3,5.555 3,7.344V17.76C3,19.549 4.451,21 6.24,21H17.76C19.549,21 21,19.549 21,17.76V7.344C21,5.555 19.549,4.104 17.76,4.104ZM6.24,5.784H6.852V6.12C6.852,6.584 7.228,6.96 7.692,6.96C8.156,6.96 8.532,6.584 8.532,6.12V5.784H15.468V6.12C15.468,6.584 15.844,6.96 16.308,6.96C16.772,6.96 17.148,6.584 17.148,6.12V5.784H17.76C18.622,5.784 19.32,6.482 19.32,7.344V8.124H4.68V7.344C4.68,6.482 5.378,5.784 6.24,5.784ZM6.24,19.32H17.76C18.622,19.32 19.32,18.622 19.32,17.76V9.804H4.68V17.76C4.68,18.622 5.378,19.32 6.24,19.32Z"
android:fillColor="#2C5CC5"
android:fillType="evenOdd"/>
</vector>
10 changes: 10 additions & 0 deletions freshchat_sdk/src/main/res/drawable/freshchat_ic_calendar_time.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M17.952,4.098H17.148V3.834C17.148,3.37 16.772,2.994 16.308,2.994C15.844,2.994 15.468,3.37 15.468,3.834V4.098H8.532V3.834C8.532,3.37 8.156,2.994 7.692,2.994C7.228,2.994 6.852,3.37 6.852,3.834V4.098H6.048C4.365,4.098 3,5.463 3,7.146V17.946C3,19.629 4.365,20.994 6.048,20.994H10.008C10.472,20.994 10.848,20.618 10.848,20.154C10.848,19.69 10.472,19.314 10.008,19.314H6.048C5.292,19.314 4.68,18.701 4.68,17.946V9.798H19.32V10.002C19.32,10.466 19.696,10.842 20.16,10.842C20.624,10.842 21,10.466 21,10.002V7.146C21,5.463 19.635,4.098 17.952,4.098ZM4.68,8.118V7.146C4.68,6.39 5.292,5.778 6.048,5.778H6.852V6.114C6.852,6.578 7.228,6.954 7.692,6.954C8.156,6.954 8.532,6.578 8.532,6.114V5.778H15.468V6.114C15.468,6.578 15.844,6.954 16.308,6.954C16.772,6.954 17.148,6.578 17.148,6.114V5.778H17.952C18.708,5.778 19.32,6.39 19.32,7.146V8.118H4.68ZM11.418,14.123C12.188,12.261 14.005,11.046 16.02,11.046C18.766,11.046 20.993,13.268 21,16.014C21.005,18.029 19.795,19.849 17.934,20.623C16.074,21.398 13.93,20.975 12.503,19.552C11.076,18.128 10.648,15.985 11.418,14.123ZM16.02,19.314C14.198,19.314 12.72,17.837 12.72,16.014C12.72,14.191 14.198,12.714 16.02,12.714C17.843,12.714 19.32,14.191 19.32,16.014C19.32,16.889 18.972,17.729 18.353,18.347C17.735,18.966 16.895,19.314 16.02,19.314ZM17.496,16.854C17.96,16.854 18.336,16.478 18.336,16.014C18.336,15.55 17.96,15.174 17.496,15.174H16.86V14.202C16.86,13.738 16.484,13.362 16.02,13.362C15.556,13.362 15.18,13.738 15.18,14.202V16.014C15.18,16.478 15.556,16.854 16.02,16.854H17.496Z"
android:fillColor="#2C5CC5"
android:fillType="evenOdd"/>
</vector>
14 changes: 4 additions & 10 deletions freshchat_sdk/src/main/res/drawable/freshchat_ic_drop_down_btn.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="16dp"
android:height="16dp"
android:viewportWidth="16"
android:viewportHeight="16">
<path
android:pathData="M11.1613,6.7097C11.5161,6.7097 11.7097,7.129 11.4516,7.3548L8.2581,10.5161C8.0968,10.6774 7.871,10.6774 7.7097,10.5161L4.5161,7.3548C4.2903,7.129 4.4516,6.7097 4.8064,6.7097H11.1613ZM0,8C0,3.5807 3.5807,0 8,0C12.4194,0 16,3.5807 16,8C16,12.4194 12.4194,16 8,16C3.5807,16 0,12.4194 0,8ZM1.5484,8C1.5484,11.5484 4.4194,14.4516 8,14.4516C11.5484,14.4516 14.4516,11.5484 14.4516,8C14.4516,4.4194 11.5484,1.5484 8,1.5484C4.4194,1.5484 1.5484,4.4194 1.5484,8Z"
android:strokeAlpha="0.6"
android:fillColor="#3A4B67"
android:fillAlpha="0.6"/>
<vector android:autoMirrored="true" android:height="24dp"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#2C5CC5" android:pathData="M8.12,9.2901L12,13.1701L15.88,9.2901C16.27,8.9001 16.9,8.9001 17.29,9.2901C17.68,9.6801 17.68,10.3101 17.29,10.7001L12.7,15.2901C12.31,15.6801 11.68,15.6801 11.29,15.2901L6.7,10.7001C6.31,10.3101 6.31,9.6801 6.7,9.2901C7.09,8.9101 7.73,8.9001 8.12,9.2901V9.2901Z"/>
</vector>
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,16 @@
android:splitMotionEvents="false"
app:freshchatFlRowSpacing="@dimen/freshchat_quick_reply_view_column_padding" />
</ScrollView>
<include
layout="@layout/freshchat_bot_calendar_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"/>
<include
layout="@layout/freshchat_bot_time_picker_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"/>

<ScrollView
android:layout_width="match_parent"
Expand All @@ -102,6 +112,19 @@
android:layout_height="wrap_content" />
</ScrollView>

<ScrollView
android:id="@+id/rating_feedback"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone">

<include
layout="@layout/freshchat_rating_feedback"
android:layout_width="match_parent"
android:layout_height="wrap_content" />

</ScrollView>


<include
android:id="@+id/botFeedBackThanksMessage"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>

<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/freshchat_bot_calendar_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:background="@color/freshchat_bot_calendar_button_background">

<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/freshchat_bot_calendar_button_divider" />

<androidx.appcompat.widget.AppCompatTextView
style="?attr/freshchatBotCalendarMessage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_marginVertical="12dp"
android:drawableLeft="?attr/freshchatBotCalendarIcon"
android:drawablePadding="6dp"
android:gravity="center"
tools:drawableLeft="@drawable/freshchat_ic_bot_calendar"
tools:text="Select Date" />
</RelativeLayout>
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>

<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/freshchat_bot_time_picker_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:background="@color/freshchat_bot_time_picker_button_background">

<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/freshchat_bot_time_picker_button_divider" />

<androidx.appcompat.widget.AppCompatTextView
style="?attr/freshchatBotTimePickerMessage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_marginVertical="12dp"
android:drawableLeft="?attr/freshchatBotTimePickerIcon"
android:drawablePadding="6dp"
android:gravity="center"
tools:drawableLeft="@drawable/freshchat_ic_calendar_time"
tools:text="Select time" />
</RelativeLayout>
65 changes: 62 additions & 3 deletions freshchat_sdk/src/main/res/layout/freshchat_bottomsheet_layout.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,9 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_centerVertical="true"
android:paddingHorizontal="16dp"
android:paddingVertical="9dp"
android:background="@drawable/freshchat_bottomsheet_cross_btn_bg"
android:paddingHorizontal="14dp"
android:paddingVertical="14dp"
android:src="?attr/freshchatBottomSheetCloseIcon" />

<androidx.appcompat.widget.AppCompatTextView
Expand All @@ -41,8 +42,29 @@
android:layout_marginTop="11dp"
android:layout_marginBottom="11dp"
tools:text="Select Country" />

<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/freshchat_bottomsheet_send_button"
style="?attr/freshchatBottomSheetSendButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_marginEnd="11dp"
android:layout_marginRight="11dp"
android:clickable="true"
android:focusable="true"
android:enabled="false"
android:paddingStart="5dp"
android:paddingTop="11dp"
android:paddingEnd="5dp"
android:paddingBottom="11dp"
tools:text="@string/freshchat_attachment_send_button"
android:visibility="invisible" />

</RelativeLayout>


<LinearLayout
android:id="@+id/freshchat_bottomsheet_search_layout"
android:layout_width="match_parent"
Expand Down Expand Up @@ -83,13 +105,50 @@
android:visibility="gone" />

</LinearLayout>
<LinearLayout
android:id="@+id/freshchat_selection_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:background="?attr/freshchatSelectionLayoutBackground"
android:layout_below="@id/freshchat_bottomsheet_search_layout"
android:visibility="gone"
>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/freshchat_bottomsheet_unselect_button"
style="?attr/freshchatBottomSheetSelectAllButton"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="match_parent"
android:paddingTop="15dp"
android:paddingBottom="15dp"
android:clickable="true"
android:focusable="true"
android:paddingLeft="16dp"
android:paddingStart="16dp"
tools:text="@string/freshchat_select_all"
/>

<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/freshchat_bottomsheet_counter"
style="?attr/freshchatBottomSheetSelectionCounter"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:paddingTop="17dp"
android:paddingBottom="17dp"
android:clickable="true"
android:layout_marginRight="16dp"
android:layout_marginEnd="16dp"
tools:text="@string/freshchat_selected_counter" />

</LinearLayout>
<View
android:id="@+id/freshchat_bottomsheet_scroll_divider"
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_marginTop="10dp"
android:layout_below="@id/freshchat_bottomsheet_search_layout"
android:layout_below="@id/freshchat_selection_layout"
android:background="@color/freshchat_message_list_reply_view_divider"
android:visibility="invisible" />

Expand Down
29 changes: 24 additions & 5 deletions freshchat_sdk/src/main/res/layout/freshchat_drop_down_input.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/freshchat_drop_down_input_frame"
style="?attr/freshchatDropDownHintTextStyle"
android:background="@drawable/freshchat_drop_down_box_bg"
android:layout_width="match_parent"
android:layout_height="52dp"
android:background="?attr/freshchatDropDownContainerBackground"
android:clickable="true"
android:focusable="true"
android:foreground="?attr/freshchatActionSelectableItemBackground" />
android:elevation="6dp"
android:focusable="true">

<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/freshchat_drop_down_input_frame_text"
style="?attr/freshchatDropDownHintTextStyle"
android:layout_alignParentStart="true"
android:layout_alignParentLeft="true" />

<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_marginTop="14dp"
android:layout_marginEnd="16dp"
android:layout_marginRight="16dp"
android:layout_marginBottom="14dp"
android:src="?attr/freshchatDropDownIcon" />
</RelativeLayout>
Loading

0 comments on commit cf633db

Please sign in to comment.