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

[NO NEED TO REVIEW NOW] Feature/entry widget and secure conversations v2 #1133

Draft
wants to merge 124 commits into
base: development
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
124 commits
Select commit Hold shift + click to select a range
9df0398
Refactor configurations
DavDo Sep 16, 2024
6c1be1f
Separate Intent-related functionality
DavDo Sep 18, 2024
21eed40
Implement Entry Widget (embedded view)
AH-MOC Sep 12, 2024
b5db063
Implement Entry Widget (bottom sheet)
AH-MOC Sep 12, 2024
8ab2a52
Create new internal layer responsible for opening screens
DavDo Sep 18, 2024
a1b3c66
Unified UI customization for Entry Widget and SCv2
AH-MOC Sep 19, 2024
c065747
Devs want to create public interfaces for EngagementLauncher
DavDo Sep 23, 2024
bef5af7
Rename all the Unified UI related classes to new SecureMessaging... way
DavDo Sep 25, 2024
321ba8c
Add support of glia custom attributes to Entry Widgets
gugalo Oct 2, 2024
cfa68c7
Change colors in layout xml's to use custom attr
gugalo Oct 2, 2024
81beeaf
Implement EngagementLauncher business logic
DavDo Sep 26, 2024
2e31302
Devs want to implement the logic for showing available engagement types
andrews-moc Sep 27, 2024
ef3e7d6
Update Entry Widget texts
gugalo Oct 3, 2024
b2e8975
Remove deprecated functions which are older than 1 year
gugalo Sep 23, 2024
dc868da
Add gliaBrandPrimaryColor tint to entry widget icon tint.
DavDo Oct 3, 2024
0bfb8b5
Send error event if Glia is not initialized before getting an Entry W…
andrews-moc Oct 4, 2024
29f67ef
Enable scrolling for the Entry Widget bottom sheet.
AH-MOC Oct 8, 2024
20f7eb6
Cache site queues after first request
DavDo Oct 7, 2024
9138bf9
Change 'Try again' button style for Entry Widget error state accordin…
andrews-moc Oct 4, 2024
8e329e5
Devs want to use cached Queues to check Secure Messaging availability
DavDo Oct 8, 2024
632348b
Added snapshot tests for the Entry Widget
AH-MOC Oct 9, 2024
d6f88ce
Pass null instead of an empty list if "Default Queues" toggle is enab…
andrews-moc Oct 8, 2024
a8dc8a8
Hide 'Secure Messaging' engagement type from Entry Widget if visitor …
andrews-moc Oct 9, 2024
55d6da9
Make queueIds list non-nullable, so only empty list means that defaul…
andrews-moc Oct 11, 2024
e213b26
Devs want to make UiTheme internal
DavDo Oct 11, 2024
224c218
Added loading tint color customization
AH-MOC Oct 14, 2024
c85f0e2
Update Kotlin version
gugalo Oct 14, 2024
42ee2b7
Devs want to always fallback to default queues
DavDo Oct 14, 2024
b32d827
Devs want to use integrator/default queues from QueueRepository
DavDo Oct 14, 2024
c3cc211
Update existing secure conversation string
gugalo Oct 16, 2024
24a6579
Update snapshots for the Entry Widget Bottom Sheet
AH-MOC Oct 14, 2024
f7cb3bd
Refactor queue management to avoid race conditions
DavDo Oct 16, 2024
6d73112
Implement Entry Widget item click navigation
andrews-moc Oct 18, 2024
85abfa0
Implement the 'Try again' button click, add unit tests for EntryWidge…
andrews-moc Oct 22, 2024
15037e6
Add global colors support for SCv2
gugalo Oct 23, 2024
b8a983b
Implement the hide() interface
andrews-moc Oct 17, 2024
fd91f19
Add accessibility labels to the Entry Widget
AH-MOC Oct 23, 2024
7221e6d
Upgrade all dependencies.
DavDo Oct 18, 2024
5070708
Entry Widget should show an empty state if only 'messaging' engagemen…
andrews-moc Oct 25, 2024
6267654
Update existing secure conversation welcome screen
gugalo Oct 22, 2024
a94091a
Implement bottom banner for secure conversation
gugalo Oct 23, 2024
8c69682
Update snapshot tests to support SCv2 bottom banner
gugalo Oct 24, 2024
6beea43
Add ability to show embedded Entry Widget view in the example app
AH-MOC Oct 29, 2024
5a5552d
Apply default attributes from XML theme
AH-MOC Oct 25, 2024
6e48047
Fix rebase conflicts
DavDo Nov 1, 2024
813ac56
Add SC business logic into Entry Widget public functions
DavDo Oct 31, 2024
7c3f5d0
Make SC APIs work seamlessly when sdk is not initialized
DavDo Nov 4, 2024
251f5c0
Add secure messaging unavailable label
gugalo Oct 30, 2024
e279d0b
Add ability to pass visitor context id through Engagement Launcher
andrews-moc Nov 1, 2024
6cc569e
Improve `chat_view.xml` layout preview
gugalo Oct 23, 2024
302827e
Fix paparazzi having problems with locales
gugalo Nov 7, 2024
517f555
Introduce Intention Enum for opening Chat screen
DavDo Nov 1, 2024
b507e84
Add business logic into EngagementLauncher.startSecureMessaging
DavDo Nov 4, 2024
28cb48c
Add Secure Conversation business logic into EngagementLauncher
DavDo Nov 5, 2024
90aaa54
Prepare Leave Dialog business logic SC flow
DavDo Nov 6, 2024
ea27583
Apply SC business logic to the Chat screen
DavDo Nov 7, 2024
78df000
Fix tests and add new ones if needed
DavDo Nov 8, 2024
0864586
Update glia colors according to new design requirements
gugalo Nov 7, 2024
e88f784
Update glia color names in internal code to match designs
gugalo Nov 7, 2024
8a76b6b
Remove half-transparent glia normal color
gugalo Nov 7, 2024
db3b2bc
Improve color matching
gugalo Nov 8, 2024
91fcd46
Update white-label color
gugalo Nov 8, 2024
033d307
Align remote theme internal color names with design mocks
gugalo Nov 8, 2024
50f8321
Update snapshots with according to new color scheme
gugalo Nov 8, 2024
048cfbe
Add logs and telemetry for Entry Widget
andrews-moc Oct 30, 2024
1b8618f
Add use case for SC top banner visibility
gugalo Nov 11, 2024
40928d6
Show the Entry Widget items in order according to the design
AH-MOC Nov 12, 2024
bef3d3b
Show unread messages counter for 'Messaging' on embedded view
andrews-moc Nov 6, 2024
9bb70c3
Show unread messages counter for 'Messaging' on embedded view
andrews-moc Nov 7, 2024
dbe68ee
Show unread messages counter for 'Messaging' on embedded view
andrews-moc Nov 7, 2024
23418c7
Show unread messages counter for 'Messaging' on embedded view
andrews-moc Nov 7, 2024
d4be021
Show unread messages counter for 'Messaging' on embedded view
andrews-moc Nov 12, 2024
ad797c6
Update EntryWidgetsView to support MESSAGING_LIVE_SUPPORT flag
gugalo Nov 12, 2024
bdb3a9c
Rename 'Live Chat' to 'Chat'
andrews-moc Nov 13, 2024
4bc278e
Replace Activity with Context in EngagementLauncher
andrews-moc Nov 14, 2024
e8768b8
Resolve merge conflicts
DavDo Nov 18, 2024
5df3578
Fix Chat screen is opened incorrectly from Call screen
DavDo Nov 19, 2024
63e5d49
Refresh Entry Widget on Glia init
andrews-moc Nov 18, 2024
3ee7200
Adjust Entry Widget UI based on designer review
andrews-moc Nov 20, 2024
bfaff11
Use subscriptions for unread messages and pending secure conversations
DavDo Nov 20, 2024
3576112
Update Core SDK staging repo url
gugalo Nov 26, 2024
22d6119
Add 'Need Live Support?' banner to SC chat
gugalo Nov 18, 2024
384a6c5
Devs want to implement GVA(Live engagement) to SC transfer
DavDo Nov 21, 2024
bccb775
Update snapshot tests after rebase
andrews-moc Nov 27, 2024
6f76b56
Update Core SDK staging repo URL
andrews-moc Nov 27, 2024
2703156
Fix RX timeout issue
gugalo Nov 27, 2024
8943efa
Prevent recursive dismiss() call
andrews-moc Nov 27, 2024
9deda24
Consider the ongoing sc when checking for secure messaging availability
DavDo Nov 28, 2024
cb9c96d
Fix Entry Widget watermark visibility is not configurable
DavDo Nov 29, 2024
7579309
Remove the timeout from SC properties
DavDo Dec 3, 2024
65f3159
Devs want to handle SC chat top banner item click
DavDo Dec 4, 2024
3d3d804
Refactor SC logic to make switching between Live and SC seamless
DavDo Dec 4, 2024
0b64562
Add snapshot tests for Entry Widget for the cases when 'whiteLabel ==…
andrews-moc Dec 4, 2024
86f16c8
Fix send and attachment buttons overlap
gugalo Dec 2, 2024
075e8c0
Add snapshot tests for SC top banner
gugalo Nov 29, 2024
52006f5
Update staging build link
gugalo Dec 12, 2024
b66d8a9
Implement Leave Current Conversation dialog
gugalo Dec 11, 2024
ab0c73b
Add disabled color state for chat input
gugalo Dec 9, 2024
4191919
Fix jumpy animation of chat input on keyboard show/hide
gugalo Dec 13, 2024
012823c
Refactor file attachment repositories
AH-MOC Dec 9, 2024
e33c241
Fix grapish color for disabled input
gugalo Dec 13, 2024
b84276e
Update staging build link
andrews-moc Dec 18, 2024
dd0ff41
Merge mark messages as read logic with leave SC
AH-MOC Dec 17, 2024
a71d6c1
Implement Entry Widget for ongoing engagement cases
andrews-moc Dec 13, 2024
f71ebe8
Add snapshot tests for 'ongoing engagement' items
andrews-moc Dec 19, 2024
774f5bf
Update staging build link
andrews-moc Dec 24, 2024
1f50cc6
Update staging build link
andrews-moc Dec 27, 2024
5f380fe
Cancel ongoing queue ticket if visitor selects engagement of another …
DavDo Oct 18, 2024
4d5a13d
Update staging build link
andrews-moc Dec 31, 2024
8b4f94e
Log additional events for an Entry Widget and Engagement Launcher
andrews-moc Dec 31, 2024
725af3a
Use internal storage instead of external for taking photos
DavDo Jan 3, 2025
bb57018
Upgrade dependencies
DavDo Jan 3, 2025
dbbf42f
Fix SDK license compliance
gugalo Dec 18, 2024
85a13ad
Update staging build link
andrews-moc Jan 10, 2025
2f06dde
Remove deprecated functions which are older than 1 year
andrews-moc Jan 9, 2025
3042c77
Update staging build link
andrews-moc Jan 13, 2025
65f2fd7
Update screenshots for several snapshot tests in com.glia.widgets.chat.
andrews-moc Jan 13, 2025
1407e3b
Do not cancel queue ticket if visitor selects engagement of the same …
andrews-moc Jan 10, 2025
9dfc6a3
Immediately mark messages as read
AH-MOC Dec 31, 2024
4a46003
Implement EngagementLauncher business logic for ongoing live engagement
DavDo Jan 10, 2025
f14a048
Remove the ongoing secure conversation check from the SC top banner.
DavDo Jan 14, 2025
ec550a0
Show only one available engagement type in Entry Widget when queueing
andrews-moc Jan 16, 2025
8d00d51
Do not end transferred SC
DavDo Jan 17, 2025
cecf58f
Fix SC bottom banner shows up when transferred sc upgrades to live
DavDo Jan 17, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion LICENSE → LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2022 Glia Technologies, Inc.
Copyright (c) 2025 Glia Technologies, Inc.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
39 changes: 0 additions & 39 deletions app/src/main/java/com/glia/exampleapp/Application.java
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
package com.glia.exampleapp;

import android.app.Activity;
import android.os.Bundle;
import android.text.TextUtils;
import android.util.Log;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

import com.glia.androidsdk.Glia;
import com.glia.widgets.GliaWidgets;
import com.google.firebase.FirebaseApp;
import com.google.firebase.FirebaseOptions;
Expand All @@ -22,8 +16,6 @@ public void onCreate() {

GliaWidgets.onAppCreate(this);
GliaWidgets.setCustomCardAdapter(new ExampleCustomCardAdapter());

initGliaWidgets();
}

private void initFirebase() {
Expand All @@ -43,35 +35,4 @@ private void initFirebase() {
.build();
FirebaseApp.initializeApp(this, options);
}

private void initGliaWidgets() {
registerActivityLifecycleCallbacks(new ActivityLifecycleCallbacks() {
@Override
public void onActivityCreated(@NonNull Activity activity, @Nullable Bundle savedInstanceState) {
if (activity.getClass() != com.glia.exampleapp.Activity.class) {
if (Glia.isInitialized()) return;

GliaWidgets.init(ExampleAppConfigManager.createDefaultConfig(getApplicationContext()));
}
}

@Override
public void onActivityStarted(@NonNull Activity activity) {}

@Override
public void onActivityResumed(@NonNull Activity activity) {}

@Override
public void onActivityPaused(@NonNull Activity activity) {}

@Override
public void onActivityStopped(@NonNull Activity activity) {}

@Override
public void onActivitySaveInstanceState(@NonNull Activity activity, @NonNull Bundle outState) {}

@Override
public void onActivityDestroyed(@NonNull Activity activity) {}
});
}
}
65 changes: 0 additions & 65 deletions app/src/main/java/com/glia/exampleapp/ChatFragment.java

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import androidx.preference.PreferenceManager
import com.glia.androidsdk.SiteApiKey
import com.glia.androidsdk.screensharing.ScreenSharing
import com.glia.widgets.GliaWidgetsConfig
import com.glia.widgets.UiTheme

/**
* Helper class to obtain Glia Config params from deep-link or preferences.
Expand Down Expand Up @@ -103,7 +102,6 @@ object ExampleAppConfigManager {
fun createDefaultConfig(
context: Context,
uiJsonRemoteConfig: String? = null,
runtimeConfig: UiTheme? = null,
region: String? = null,
baseDomain: String = DEFAULT_BASE_DOMAIN,
preferences: SharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
Expand Down Expand Up @@ -157,7 +155,6 @@ object ExampleAppConfigManager {
.setScreenSharingMode(screenSharingMode)
.setContext(context)
.setUiJsonRemoteConfig(uiJsonRemoteConfig ?: Utils.getRemoteThemeByPrefs(preferences, context.resources))
.setUiTheme(runtimeConfig ?: Utils.getRunTimeThemeByPrefs(preferences, context.resources))
.setManualLocaleOverride(manualLocaleOverride)
.build()
}
Expand Down
Loading