Skip to content

Commit 0a8101c

Browse files
DavDoDavDo
committed
Edge to Edge support
- All screens now edge to edge enforced - Remove the status bar color setting, since it replaced by padding - Minor UI fixes MOB 3554
1 parent 727cccf commit 0a8101c

File tree

40 files changed

+207
-290
lines changed

40 files changed

+207
-290
lines changed

‎app/src/main/java/com/glia/exampleapp/MainFragment.kt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ class MainFragment : Fragment() {
517517
GliaWidgets.init(
518518
createDefaultConfig(
519519
context = requireActivity().applicationContext,
520-
// uiJsonRemoteConfig = UnifiedUiConfigurationLoader.fetchLocalGlobalColors(requireContext()),
520+
// uiJsonRemoteConfig = UnifiedUiConfigurationLoader.fetchRemoteConfiguration(),
521521
// runtimeConfig = createSampleRuntimeConfig(),
522522
// region = "us"
523523
)
@@ -526,14 +526,13 @@ class MainFragment : Fragment() {
526526
setupAuthButtonsVisibility()
527527
listenForCallVisualizerEngagements()
528528

529-
view?.post {
530-
initMenu()
531-
}
529+
view?.post { initMenu() }
532530
}
533531

534532
private fun createSampleRuntimeConfig(): UiTheme = UiTheme(
535533
gvaQuickReplyTextColor = android.R.color.holo_green_dark,
536-
gvaQuickReplyStrokeColor = android.R.color.holo_green_dark
534+
gvaQuickReplyStrokeColor = android.R.color.holo_green_dark,
535+
brandPrimaryColor = android.R.color.holo_green_dark
537536
)
538537

539538
private fun prepareAuthentication() {

‎app/src/main/res/layout/main_fragment.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,20 @@
2424

2525
<com.google.android.material.appbar.AppBarLayout
2626
android:id="@+id/tool_bar_layout"
27+
style="@style/Widget.MaterialComponents.AppBarLayout.Primary"
2728
android:layout_width="match_parent"
2829
android:layout_height="wrap_content"
30+
android:fitsSystemWindows="true"
2931
app:layout_constraintTop_toTopOf="parent">
3032

3133
<com.google.android.material.appbar.MaterialToolbar
3234
android:id="@+id/top_app_bar"
35+
android:layout_height="wrap_content"
36+
android:elevation="0dp"
3337
style="@style/Widget.MaterialComponents.Toolbar.Primary"
3438
android:layout_width="match_parent"
35-
android:layout_height="?attr/actionBarSize"
39+
android:minHeight="?attr/actionBarSize"
40+
app:elevation="0dp"
3641
app:menu="@menu/menu_main_fragment"
3742
app:title="@string/app_name" />
3843

‎app/src/main/res/raw/sample_unified_config.json

Lines changed: 27 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1134,9 +1134,10 @@
11341134
},
11351135
"borderWidth": 2,
11361136
"color": {
1137-
"type": "fill",
1137+
"type": "gradient",
11381138
"value": [
1139-
"#000000"
1139+
"#fdd42b",
1140+
"#ff0000"
11401141
]
11411142
},
11421143
"cornerRadius": 8
@@ -1187,9 +1188,10 @@
11871188
},
11881189
"borderWidth": 2,
11891190
"color": {
1190-
"type": "fill",
1191+
"type": "gradient",
11911192
"value": [
1192-
"#f9d12b"
1193+
"#fdd42b",
1194+
"#ff0000"
11931195
]
11941196
},
11951197
"cornerRadius": 8
@@ -1962,9 +1964,10 @@
19621964
},
19631965
"borderWidth": 2,
19641966
"color": {
1965-
"type": "fill",
1967+
"type": "gradient",
19661968
"value": [
1967-
"#fdd42b"
1969+
"#fdd42b",
1970+
"#ff0000"
19681971
]
19691972
},
19701973
"cornerRadius": 8
@@ -3990,9 +3993,10 @@
39903993
},
39913994
"borderWidth": 2,
39923995
"color": {
3993-
"type": "fill",
3996+
"type": "gradient",
39943997
"value": [
3995-
"#fdd42b"
3998+
"#fdd42b",
3999+
"#ff0000"
39964000
]
39974001
},
39984002
"cornerRadius": 8
@@ -4413,9 +4417,10 @@
44134417
},
44144418
"borderWidth": 2,
44154419
"color": {
4416-
"type": "fill",
4420+
"type": "gradient",
44174421
"value": [
4418-
"#000000"
4422+
"#fdd42b",
4423+
"#ff0000"
44194424
]
44204425
},
44214426
"cornerRadius": 8
@@ -4466,9 +4471,10 @@
44664471
},
44674472
"borderWidth": 2,
44684473
"color": {
4469-
"type": "fill",
4474+
"type": "gradient",
44704475
"value": [
4471-
"#f9d12b"
4476+
"#fdd42b",
4477+
"#ff0000"
44724478
]
44734479
},
44744480
"cornerRadius": 8
@@ -4790,9 +4796,10 @@
47904796
},
47914797
"borderWidth": 2,
47924798
"color": {
4793-
"type": "fill",
4799+
"type": "gradient",
47944800
"value": [
4795-
"#000000"
4801+
"#fdd42b",
4802+
"#ff0000"
47964803
]
47974804
},
47984805
"cornerRadius": 8
@@ -4843,9 +4850,10 @@
48434850
},
48444851
"borderWidth": 2,
48454852
"color": {
4846-
"type": "fill",
4853+
"type": "gradient",
48474854
"value": [
4848-
"#f9d12b"
4855+
"#fdd42b",
4856+
"#ff0000"
48494857
]
48504858
},
48514859
"cornerRadius": 8
@@ -5212,9 +5220,10 @@
52125220
},
52135221
"borderWidth": 2,
52145222
"color": {
5215-
"type": "fill",
5223+
"type": "gradient",
52165224
"value": [
5217-
"#fdd42b"
5225+
"#fdd42b",
5226+
"#ff0000"
52185227
]
52195228
},
52205229
"cornerRadius": 8

‎widgetssdk/src/main/java/com/glia/widgets/base/FadeTransitionActivity.kt

Lines changed: 34 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
package com.glia.widgets.base
22

33
import android.content.Intent
4+
import android.os.Build
45
import android.os.Bundle
6+
import androidx.activity.enableEdgeToEdge
7+
import androidx.annotation.RequiresApi
58
import androidx.appcompat.app.AppCompatActivity
6-
import com.glia.androidsdk.Glia
79
import com.glia.widgets.di.Dependencies
10+
import com.glia.widgets.helper.insetsControllerCompat
811
import com.glia.widgets.locale.LocaleString
912
import io.reactivex.rxjava3.disposables.Disposable
1013

@@ -16,30 +19,50 @@ open class FadeTransitionActivity : AppCompatActivity() {
1619
private var disposable: Disposable? = null
1720
private val localeProvider = Dependencies.localeProvider
1821

19-
override fun onCreate(savedInstanceState: Bundle?) {
20-
super.onCreate(savedInstanceState)
21-
overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out)
22+
23+
@RequiresApi(Build.VERSION_CODES.UPSIDE_DOWN_CAKE)
24+
private fun overrideAnimation() {
25+
overrideActivityTransition(OVERRIDE_TRANSITION_OPEN, android.R.anim.fade_in, android.R.anim.fade_out)
26+
overrideActivityTransition(OVERRIDE_TRANSITION_CLOSE, android.R.anim.fade_in, android.R.anim.fade_out)
2227
}
2328

24-
override fun finish() {
25-
super.finish()
26-
overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out)
29+
private fun overrideAnimationCompat() {
30+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
31+
overrideAnimation()
32+
return
33+
}
34+
35+
overrideAnimationApi33()
36+
}
37+
38+
@Suppress("DEPRECATION")
39+
private fun overrideAnimationApi33() {
40+
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
41+
overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out)
42+
}
43+
}
44+
45+
override fun onCreate(savedInstanceState: Bundle?) {
46+
enableEdgeToEdge()
47+
window.insetsControllerCompat.isAppearanceLightStatusBars = false
48+
overrideAnimationCompat()
49+
super.onCreate(savedInstanceState)
2750
}
2851

2952
override fun finishAndRemoveTask() {
3053
super.finishAndRemoveTask()
31-
overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out)
54+
overrideAnimationApi33()
3255
disposable?.dispose()
3356
}
3457

3558
override fun startActivity(intent: Intent?) {
3659
super.startActivity(intent)
37-
overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out)
60+
overrideAnimationApi33()
3861
}
3962

4063
override fun startActivity(intent: Intent?, options: Bundle?) {
4164
super.startActivity(intent, options)
42-
overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out)
65+
overrideAnimationApi33()
4366
}
4467

4568
fun setTitle(locale: LocaleString?) {
@@ -56,7 +79,7 @@ open class FadeTransitionActivity : AppCompatActivity() {
5679
.subscribe(
5780
{ super.setTitle(it) },
5881
{ /* no-op */ }
59-
)
82+
)
6083
}
6184

6285
}

‎widgetssdk/src/main/java/com/glia/widgets/call/CallActivity.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
import androidx.annotation.Nullable;
88

99
import com.glia.widgets.GliaWidgets;
10-
import com.glia.widgets.locale.LocaleString;
1110
import com.glia.widgets.R;
1211
import com.glia.widgets.base.FadeTransitionActivity;
1312
import com.glia.widgets.chat.ChatActivity;
1413
import com.glia.widgets.core.configuration.EngagementConfiguration;
1514
import com.glia.widgets.di.Dependencies;
1615
import com.glia.widgets.helper.Logger;
1716
import com.glia.widgets.helper.Utils;
17+
import com.glia.widgets.locale.LocaleString;
1818
import com.glia.widgets.webbrowser.WebBrowserActivity;
1919

2020
import java.util.ArrayList;
@@ -161,9 +161,9 @@ private void navigateToWebBrowser(LocaleString title, String url) {
161161

162162
/**
163163
* Creates and fills out Intent for starting CallActivity
164-
* @deprecated use {@link #getIntent(Context, EngagementConfiguration)} since 1.8.2
164+
* @deprecated use {@link #getIntent(Context, CallConfiguration)} since 1.8.2
165165
* @param applicationContext - application context
166-
* @param sdkConfiguration - widgets sdk configuration
166+
* @param engagementConfiguration - widgets sdk configuration
167167
* @param mediaType - media type that should be started (in case media engagement not ongoing)
168168
* @return Intent for starting CallActivity
169169
*/

0 commit comments

Comments
 (0)