Skip to content

Commit c79f2ff

Browse files
committed
Enable edgeToEdge
1 parent daadbbd commit c79f2ff

File tree

64 files changed

+261
-13
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+261
-13
lines changed

vector-app/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import android.app.NotificationChannel
1212
import android.app.NotificationManager
1313
import android.content.Intent
1414
import android.os.Build
15+
import android.view.View
1516
import androidx.core.app.NotificationCompat
1617
import androidx.core.app.Person
1718
import androidx.core.content.getSystemService
@@ -49,7 +50,9 @@ import javax.inject.Inject
4950
class DebugMenuActivity : VectorBaseActivity<ActivityDebugMenuBinding>() {
5051

5152
override fun getBinding() = ActivityDebugMenuBinding.inflate(layoutInflater)
52-
53+
override fun getCoordinatorLayout() = views.coordinatorLayout
54+
override val rootView: View
55+
get() = views.coordinatorLayout
5356
@Inject lateinit var clock: Clock
5457

5558
private lateinit var buffer: ByteArray

vector-app/src/debug/java/im/vector/app/features/debug/DebugPermissionActivity.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ package im.vector.app.features.debug
1010
import android.Manifest
1111
import android.content.pm.PackageManager
1212
import android.os.Build
13+
import android.view.View
1314
import android.widget.Toast
1415
import androidx.core.app.ActivityCompat
1516
import androidx.core.content.ContextCompat
@@ -32,6 +33,9 @@ class DebugPermissionActivity : VectorBaseActivity<ActivityDebugPermissionBindin
3233

3334
override fun getCoordinatorLayout() = views.coordinatorLayout
3435

36+
override val rootView: View
37+
get() = views.coordinatorLayout
38+
3539
// For debug
3640
private val allPermissions = listOf(
3741
Manifest.permission.CAMERA,

vector-app/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsActivity.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
package im.vector.app.features.debug.analytics
99

10+
import android.view.View
1011
import dagger.hilt.android.AndroidEntryPoint
1112
import im.vector.app.core.extensions.addFragment
1213
import im.vector.app.core.platform.VectorBaseActivity
@@ -17,6 +18,10 @@ class DebugAnalyticsActivity : VectorBaseActivity<ActivitySimpleBinding>() {
1718

1819
override fun getBinding() = ActivitySimpleBinding.inflate(layoutInflater)
1920

21+
override fun getCoordinatorLayout() = views.coordinatorLayout
22+
override val rootView: View
23+
get() = views.coordinatorLayout
24+
2025
override fun initUiAndData() {
2126
if (isFirstCreation()) {
2227
addFragment(

vector-app/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesSettingsActivity.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
package im.vector.app.features.debug.features
99

1010
import android.os.Bundle
11+
import android.view.View
1112
import dagger.hilt.android.AndroidEntryPoint
1213
import im.vector.app.core.extensions.cleanup
1314
import im.vector.app.core.extensions.configureWith
@@ -24,6 +25,9 @@ class DebugFeaturesSettingsActivity : VectorBaseActivity<FragmentGenericRecycler
2425

2526
override fun getBinding() = FragmentGenericRecyclerBinding.inflate(layoutInflater)
2627

28+
override val rootView: View
29+
get() = views.mainRoot
30+
2731
override fun onCreate(savedInstanceState: Bundle?) {
2832
super.onCreate(savedInstanceState)
2933
controller.listener = object : FeaturesController.Listener {

vector-app/src/debug/java/im/vector/app/features/debug/jitsi/DebugJitsiActivity.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
package im.vector.app.features.debug.jitsi
99

1010
import android.annotation.SuppressLint
11+
import android.view.View
1112
import dagger.hilt.android.AndroidEntryPoint
1213
import im.vector.app.core.platform.VectorBaseActivity
1314
import im.vector.application.databinding.ActivityDebugJitsiBinding
@@ -19,6 +20,8 @@ class DebugJitsiActivity : VectorBaseActivity<ActivityDebugJitsiBinding>() {
1920
override fun getBinding() = ActivityDebugJitsiBinding.inflate(layoutInflater)
2021

2122
override fun getCoordinatorLayout() = views.coordinatorLayout
23+
override val rootView: View
24+
get() = views.coordinatorLayout
2225

2326
@SuppressLint("SetTextI18n")
2427
override fun initUiAndData() {

vector-app/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksActivity.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
package im.vector.app.features.debug.leak
99

10+
import android.view.View
1011
import dagger.hilt.android.AndroidEntryPoint
1112
import im.vector.app.core.extensions.addFragment
1213
import im.vector.app.core.platform.VectorBaseActivity
@@ -17,6 +18,10 @@ class DebugMemoryLeaksActivity : VectorBaseActivity<ActivitySimpleBinding>() {
1718

1819
override fun getBinding() = ActivitySimpleBinding.inflate(layoutInflater)
1920

21+
override fun getCoordinatorLayout() = views.coordinatorLayout
22+
override val rootView: View
23+
get() = views.coordinatorLayout
24+
2025
override fun initUiAndData() {
2126
if (isFirstCreation()) {
2227
addFragment(

vector-app/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsActivity.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
package im.vector.app.features.debug.settings
99

10+
import android.view.View
1011
import dagger.hilt.android.AndroidEntryPoint
1112
import im.vector.app.core.extensions.addFragment
1213
import im.vector.app.core.platform.VectorBaseActivity
@@ -17,6 +18,10 @@ class DebugPrivateSettingsActivity : VectorBaseActivity<ActivitySimpleBinding>()
1718

1819
override fun getBinding() = ActivitySimpleBinding.inflate(layoutInflater)
1920

21+
override fun getCoordinatorLayout() = views.coordinatorLayout
22+
override val rootView: View
23+
get() = views.coordinatorLayout
24+
2025
override fun initUiAndData() {
2126
if (isFirstCreation()) {
2227
addFragment(

vector/src/main/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,7 @@
167167

168168
<activity
169169
android:name=".features.home.room.detail.RoomDetailActivity"
170-
android:parentActivityName=".features.home.HomeActivity"
171-
android:windowSoftInputMode="adjustResize">
170+
android:parentActivityName=".features.home.HomeActivity">
172171
<meta-data
173172
android:name="android.support.PARENT_ACTIVITY"
174173
android:value=".features.home.HomeActivity" />

vector/src/main/java/im/vector/app/core/platform/SimpleFragmentActivity.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
*/
77
package im.vector.app.core.platform
88

9+
import android.view.View
910
import androidx.core.view.isGone
1011
import androidx.core.view.isVisible
1112
import im.vector.app.core.extensions.hideKeyboard
@@ -20,6 +21,9 @@ abstract class SimpleFragmentActivity : VectorBaseActivity<ActivityBinding>() {
2021

2122
final override fun getCoordinatorLayout() = views.coordinatorLayout
2223

24+
override val rootView: View
25+
get() = views.coordinatorLayout
26+
2327
override fun initUiAndData() {
2428
setupToolbar(views.toolbar)
2529
.allowBack(true)

vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import android.view.MenuItem
1717
import android.view.View
1818
import android.view.WindowManager
1919
import android.widget.TextView
20+
import androidx.activity.enableEdgeToEdge
2021
import androidx.annotation.CallSuper
2122
import androidx.annotation.MainThread
2223
import androidx.annotation.StringRes
@@ -25,7 +26,10 @@ import androidx.coordinatorlayout.widget.CoordinatorLayout
2526
import androidx.core.app.MultiWindowModeChangedInfo
2627
import androidx.core.util.Consumer
2728
import androidx.core.view.MenuProvider
29+
import androidx.core.view.ViewCompat
30+
import androidx.core.view.WindowInsetsCompat
2831
import androidx.core.view.isVisible
32+
import androidx.core.view.updatePadding
2933
import androidx.fragment.app.FragmentManager
3034
import androidx.lifecycle.Lifecycle
3135
import androidx.lifecycle.ViewModelProvider
@@ -205,6 +209,7 @@ abstract class VectorBaseActivity<VB : ViewBinding> : AppCompatActivity(), Maver
205209
val activityEntryPoint = EntryPointAccessors.fromActivity(this, ActivityEntryPoint::class.java)
206210
ThemeUtils.setActivityTheme(this, getOtherThemes())
207211
viewModelFactory = activityEntryPoint.viewModelFactory()
212+
enableEdgeToEdge()
208213
super.onCreate(savedInstanceState)
209214
addOnMultiWindowModeChangedListener(onMultiWindowModeChangedListener)
210215
setupMenu()
@@ -411,6 +416,20 @@ abstract class VectorBaseActivity<VB : ViewBinding> : AppCompatActivity(), Maver
411416
// Just log that a change occurred.
412417
Timber.w("MDM data has been updated")
413418
}
419+
ViewCompat.setOnApplyWindowInsetsListener(rootView) { v, insets ->
420+
val systemBars = insets.getInsets(
421+
WindowInsetsCompat.Type.systemBars() or
422+
WindowInsetsCompat.Type.displayCutout() or
423+
WindowInsetsCompat.Type.ime()
424+
)
425+
v.updatePadding(
426+
systemBars.left,
427+
systemBars.top,
428+
systemBars.right,
429+
systemBars.bottom,
430+
)
431+
insets
432+
}
414433
}
415434

416435
private val postResumeScheduledActions = mutableListOf<() -> Unit>()
@@ -592,6 +611,8 @@ abstract class VectorBaseActivity<VB : ViewBinding> : AppCompatActivity(), Maver
592611

593612
open fun getCoordinatorLayout(): CoordinatorLayout? = null
594613

614+
abstract val rootView: View
615+
595616
/* ==========================================================================================
596617
* User Consent
597618
* ========================================================================================== */

0 commit comments

Comments
 (0)