Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Master back merge with 2.2.0 final changes #798

Merged
merged 27 commits into from
Oct 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
70dee40
Add correct commit author to Bitrise commits
gersonnoboa Jun 5, 2023
7965589
Merge pull request #629 from salemove/MOB-1696
Jun 12, 2023
72a9f27
Merge branch 'master' into release/2.0.1
gugalo Jul 11, 2023
b767e5f
Merge pull request #657 from salemove/release/2.0.1
gugalo Jul 11, 2023
72092f7
Merge pull request #665 from salemove/release/2.0.2
gugalo Jul 12, 2023
003e3e1
Enable chat input after engagement transfer (operator connected)
andrews-moc Aug 10, 2023
d3d8149
Increment Core SDK version to 1.0.3 (hotfix)
andrews-moc Aug 10, 2023
8c6eedb
Open dialogs on top of CallVisualizerSupportActivity instead of integ…
andrews-moc Aug 10, 2023
a3441ab
Increment Core SDK version to 1.0.3 - edit date
andrews-moc Aug 10, 2023
273c5a3
Remove the notification about audio/video engagement starts if an app…
AH-MOC Aug 8, 2023
d1a781a
Set WebViewCardAdapter as a default CustomCardAdapter
AH-MOC Aug 4, 2023
450254d
Improve solution for opening dialogs on top of CallVisualizerSupportA…
andrews-moc Aug 18, 2023
092f55a
Remove engagement end Listener from MessagesNotSeenHandler on GliaWid…
DavDo Aug 25, 2023
b842d59
Enable Operator Image for Joined Status
DavDo Aug 24, 2023
cd21d4d
Do not unsubscribe from engagement events for Call Visualizer
andrews-moc Aug 28, 2023
c15551e
Increment project version to 2.0.4
Pelkar Aug 10, 2023
c54b473
Increment Core SDK version to 1.0.4
Aug 30, 2023
07cd096
Merge branch 'master' into release/2.1.0
DavDo Sep 4, 2023
864f2fc
Merge pull request #749 from salemove/release/2.1.0
DavDo Sep 5, 2023
64b41f7
Merge pull request #756 from salemove/release/2.1.1
andrews-moc Sep 7, 2023
d9db1d7
Merge pull request #769 from salemove/release/2.1.2
andrews-moc Sep 15, 2023
379c036
Merge pull request #772 from salemove/release/2.1.3
andrews-moc Sep 18, 2023
1b4487c
Incremented version to 2.2.0
Pelkar Oct 11, 2023
781c469
Incremented version to 2.2.0
Pelkar Oct 11, 2023
c98d229
Merge pull request #796 from salemove/release/2.2.0
Pelkar Oct 11, 2023
31f3e51
test code cleanup
Pelkar Oct 12, 2023
eee9ecc
Merge pull request #797 from salemove/release/2.2.0
Pelkar Oct 12, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion version.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#Tue Sep 26 09:30:40 UTC 2023
dependency.coreSdk.version=1.1.4
widgets.versionCode=72
widgets.versionName=2.1.4
widgets.versionName=2.2.0
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ class StringProviderImpl(private val resourceProvider: ResourceProvider): String
}
cleanupRemainingReferences(returnValue)
} ?: kotlin.run {
"_" + resourceProvider.getString(stringKey, *values.map { pair -> pair?.value }.toTypedArray())
resourceProvider.getString(stringKey, *values.map { pair -> pair?.value }.toTypedArray())
}
} catch (e: GliaException) {
Logger.e("StringProvider", "**** ATTENTION **** \n An engagement view was opened immediately after Glia was initialized. \n It is strongly suggested to keep the initialization and actual engagement start separated by a little more time to allow custom locales feature to work properly.\n For further information See the Custom Locales migration guide", e)
"_" + resourceProvider.getString(stringKey, *values.map { pair -> pair?.value }.toTypedArray())
resourceProvider.getString(stringKey, *values.map { pair -> pair?.value }.toTypedArray())
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ class EndScreenSharingView(
}

private fun setupViewTextResources() {
binding.appBarView.setTitle(stringProvider.getRemoteString(R.string.call_visualizer_screen_sharing_header))
binding.screenSharingLabel.text = stringProvider.getRemoteString(R.string.call_visualizer_label)
binding.appBarView.setTitle(stringProvider.getRemoteString(R.string.call_visualizer_screen_sharing_header_title))
binding.screenSharingLabel.text = stringProvider.getRemoteString(R.string.call_visualizer_screen_sharing_message)
binding.endSharingButton.text = stringProvider.getRemoteString(R.string.screen_sharing_visitor_screen_end_title)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ class MessageView(

private fun setupViewAppearance() {
title.text = stringProvider.getRemoteString(R.string.message_center_welcome_title)
description.text = stringProvider.getRemoteString(R.string.media_messaging_description)
description.text = stringProvider.getRemoteString(R.string.message_center_welcome_subtitle)
checkMessagesButton.text = stringProvider.getRemoteString(R.string.message_center_welcome_check_messages)
checkMessagesButton.contentDescription = stringProvider.getRemoteString(R.string.message_center_welcome_check_messages_accessibility_hint)
messageTitle.text = stringProvider.getRemoteString(R.string.message_center_welcome_message_title)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
tools:text="@string/message_center_title"
android:textColor="?attr/gliaBaseDarkColor"
android:textSize="20sp"
app:layout_constrainedWidth="true"
app:layout_constraintBottom_toTopOf="@id/description"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
Expand All @@ -65,6 +66,7 @@
tools:text="@string/message_center_description"
android:textColor="?attr/gliaBaseDarkColor"
android:textSize="14sp"
app:layout_constrainedWidth="true"
app:layout_constraintBottom_toTopOf="@id/btn_check_messages"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
Expand Down
4 changes: 2 additions & 2 deletions widgetssdk/src/main/res/values/new_strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<!-- Call Visualizer -->
<string name="call_visualizer_visitor_code_title">@string/glia_visitor_code_view_title</string>
<string name="visitor_code_failed">@string/glia_visitor_code_error_title</string>
<string name="call_visualizer_screen_sharing_header">@string/call_visualizer_screen_sharing_title</string>
<string name="call_visualizer_screen_sharing_header_title">@string/call_visualizer_screen_sharing_title</string>
<string name="call_visualizer_screen_sharing_message">@string/call_visualizer_label</string>
<string name="screen_sharing_visitor_screen_end_title">@string/call_visualizer_button</string>
<string name="android_visitor_code_loading">@string/glia_visitor_code_loading</string>
Expand Down Expand Up @@ -157,7 +157,7 @@
<string name="message_center_confirmation_subtitle">@string/message_center_confirmation_screen_message</string>
<string name="message_center_confirmation_check_messages_accessibility_hint">Navigates you to the chat transcript.</string>
<string name="engagement_secure_messaging_title">@string/message_center_screen_title</string>
<string name="media_messaging_description">@string/message_center_description</string>
<string name="message_center_welcome_subtitle">@string/message_center_description</string>
<string name="general_sending">@string/message_center_progress_bar_content_description</string>
<string name="general_send">@string/message_center_send_message_btn</string>
<string name="message_center_welcome_file_picker_label_accessibility_label">File picker</string>
Expand Down
Loading