diff --git a/vector-app/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt b/vector-app/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt index 288b7a89bd..876baf69d9 100644 --- a/vector-app/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt +++ b/vector-app/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt @@ -12,6 +12,7 @@ import android.app.NotificationChannel import android.app.NotificationManager import android.content.Intent import android.os.Build +import android.view.View import androidx.core.app.NotificationCompat import androidx.core.app.Person import androidx.core.content.getSystemService @@ -49,7 +50,9 @@ import javax.inject.Inject class DebugMenuActivity : VectorBaseActivity() { override fun getBinding() = ActivityDebugMenuBinding.inflate(layoutInflater) - + override fun getCoordinatorLayout() = views.coordinatorLayout + override val rootView: View + get() = views.coordinatorLayout @Inject lateinit var clock: Clock private lateinit var buffer: ByteArray diff --git a/vector-app/src/debug/java/im/vector/app/features/debug/DebugPermissionActivity.kt b/vector-app/src/debug/java/im/vector/app/features/debug/DebugPermissionActivity.kt index cae9f63b22..9f5622713b 100644 --- a/vector-app/src/debug/java/im/vector/app/features/debug/DebugPermissionActivity.kt +++ b/vector-app/src/debug/java/im/vector/app/features/debug/DebugPermissionActivity.kt @@ -10,6 +10,7 @@ package im.vector.app.features.debug import android.Manifest import android.content.pm.PackageManager import android.os.Build +import android.view.View import android.widget.Toast import androidx.core.app.ActivityCompat import androidx.core.content.ContextCompat @@ -32,6 +33,9 @@ class DebugPermissionActivity : VectorBaseActivity() { override fun getBinding() = ActivitySimpleBinding.inflate(layoutInflater) + override fun getCoordinatorLayout() = views.coordinatorLayout + override val rootView: View + get() = views.coordinatorLayout + override fun initUiAndData() { if (isFirstCreation()) { addFragment( diff --git a/vector-app/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesSettingsActivity.kt b/vector-app/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesSettingsActivity.kt index 2f7ff692af..b4a7793962 100644 --- a/vector-app/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesSettingsActivity.kt +++ b/vector-app/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesSettingsActivity.kt @@ -8,6 +8,7 @@ package im.vector.app.features.debug.features import android.os.Bundle +import android.view.View import dagger.hilt.android.AndroidEntryPoint import im.vector.app.core.extensions.cleanup import im.vector.app.core.extensions.configureWith @@ -24,6 +25,9 @@ class DebugFeaturesSettingsActivity : VectorBaseActivity() { override fun getBinding() = ActivityDebugJitsiBinding.inflate(layoutInflater) override fun getCoordinatorLayout() = views.coordinatorLayout + override val rootView: View + get() = views.coordinatorLayout @SuppressLint("SetTextI18n") override fun initUiAndData() { diff --git a/vector-app/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksActivity.kt b/vector-app/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksActivity.kt index f942fc342d..7eb9ea99d6 100644 --- a/vector-app/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksActivity.kt +++ b/vector-app/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksActivity.kt @@ -7,6 +7,7 @@ package im.vector.app.features.debug.leak +import android.view.View import dagger.hilt.android.AndroidEntryPoint import im.vector.app.core.extensions.addFragment import im.vector.app.core.platform.VectorBaseActivity @@ -17,6 +18,10 @@ class DebugMemoryLeaksActivity : VectorBaseActivity() { override fun getBinding() = ActivitySimpleBinding.inflate(layoutInflater) + override fun getCoordinatorLayout() = views.coordinatorLayout + override val rootView: View + get() = views.coordinatorLayout + override fun initUiAndData() { if (isFirstCreation()) { addFragment( diff --git a/vector-app/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsActivity.kt b/vector-app/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsActivity.kt index 017bde5eb7..2a539a21ca 100644 --- a/vector-app/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsActivity.kt +++ b/vector-app/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsActivity.kt @@ -7,6 +7,7 @@ package im.vector.app.features.debug.settings +import android.view.View import dagger.hilt.android.AndroidEntryPoint import im.vector.app.core.extensions.addFragment import im.vector.app.core.platform.VectorBaseActivity @@ -17,6 +18,10 @@ class DebugPrivateSettingsActivity : VectorBaseActivity() override fun getBinding() = ActivitySimpleBinding.inflate(layoutInflater) + override fun getCoordinatorLayout() = views.coordinatorLayout + override val rootView: View + get() = views.coordinatorLayout + override fun initUiAndData() { if (isFirstCreation()) { addFragment( diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml index ce1b2537f1..7455c0847f 100644 --- a/vector/src/main/AndroidManifest.xml +++ b/vector/src/main/AndroidManifest.xml @@ -167,8 +167,7 @@ + android:parentActivityName=".features.home.HomeActivity"> diff --git a/vector/src/main/java/im/vector/app/core/platform/SimpleFragmentActivity.kt b/vector/src/main/java/im/vector/app/core/platform/SimpleFragmentActivity.kt index 06eecf1d41..12ed8418bc 100644 --- a/vector/src/main/java/im/vector/app/core/platform/SimpleFragmentActivity.kt +++ b/vector/src/main/java/im/vector/app/core/platform/SimpleFragmentActivity.kt @@ -6,6 +6,7 @@ */ package im.vector.app.core.platform +import android.view.View import androidx.core.view.isGone import androidx.core.view.isVisible import im.vector.app.core.extensions.hideKeyboard @@ -20,6 +21,9 @@ abstract class SimpleFragmentActivity : VectorBaseActivity() { final override fun getCoordinatorLayout() = views.coordinatorLayout + override val rootView: View + get() = views.coordinatorLayout + override fun initUiAndData() { setupToolbar(views.toolbar) .allowBack(true) diff --git a/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt b/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt index dcec88bdbc..a6b9d77930 100644 --- a/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt +++ b/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt @@ -17,6 +17,7 @@ import android.view.MenuItem import android.view.View import android.view.WindowManager import android.widget.TextView +import androidx.activity.enableEdgeToEdge import androidx.annotation.CallSuper import androidx.annotation.MainThread import androidx.annotation.StringRes @@ -25,7 +26,10 @@ import androidx.coordinatorlayout.widget.CoordinatorLayout import androidx.core.app.MultiWindowModeChangedInfo import androidx.core.util.Consumer import androidx.core.view.MenuProvider +import androidx.core.view.ViewCompat +import androidx.core.view.WindowInsetsCompat import androidx.core.view.isVisible +import androidx.core.view.updatePadding import androidx.fragment.app.FragmentManager import androidx.lifecycle.Lifecycle import androidx.lifecycle.ViewModelProvider @@ -205,6 +209,7 @@ abstract class VectorBaseActivity : AppCompatActivity(), Maver val activityEntryPoint = EntryPointAccessors.fromActivity(this, ActivityEntryPoint::class.java) ThemeUtils.setActivityTheme(this, getOtherThemes()) viewModelFactory = activityEntryPoint.viewModelFactory() + enableEdgeToEdge() super.onCreate(savedInstanceState) addOnMultiWindowModeChangedListener(onMultiWindowModeChangedListener) setupMenu() @@ -411,6 +416,20 @@ abstract class VectorBaseActivity : AppCompatActivity(), Maver // Just log that a change occurred. Timber.w("MDM data has been updated") } + ViewCompat.setOnApplyWindowInsetsListener(rootView) { v, insets -> + val systemBars = insets.getInsets( + WindowInsetsCompat.Type.systemBars() or + WindowInsetsCompat.Type.displayCutout() or + WindowInsetsCompat.Type.ime() + ) + v.updatePadding( + systemBars.left, + systemBars.top, + systemBars.right, + systemBars.bottom, + ) + insets + } } private val postResumeScheduledActions = mutableListOf<() -> Unit>() @@ -592,6 +611,8 @@ abstract class VectorBaseActivity : AppCompatActivity(), Maver open fun getCoordinatorLayout(): CoordinatorLayout? = null + abstract val rootView: View + /* ========================================================================================== * User Consent * ========================================================================================== */ diff --git a/vector/src/main/java/im/vector/app/features/MainActivity.kt b/vector/src/main/java/im/vector/app/features/MainActivity.kt index 6b16c2deb8..9c95a5d835 100644 --- a/vector/src/main/java/im/vector/app/features/MainActivity.kt +++ b/vector/src/main/java/im/vector/app/features/MainActivity.kt @@ -12,6 +12,7 @@ import android.content.Context import android.content.Intent import android.os.Bundle import android.os.Parcelable +import android.view.View import androidx.core.content.ContextCompat import androidx.core.view.isVisible import androidx.lifecycle.Lifecycle @@ -392,4 +393,7 @@ class MainActivity : VectorBaseActivity(), UnlockedActivity val className = componentName.className return packageName == buildMeta.applicationId && className in allowList } + + override val rootView: View + get() = views.mainRoot } diff --git a/vector/src/main/java/im/vector/app/features/analytics/ui/consent/AnalyticsOptInActivity.kt b/vector/src/main/java/im/vector/app/features/analytics/ui/consent/AnalyticsOptInActivity.kt index e3cf06bd87..42598f4356 100644 --- a/vector/src/main/java/im/vector/app/features/analytics/ui/consent/AnalyticsOptInActivity.kt +++ b/vector/src/main/java/im/vector/app/features/analytics/ui/consent/AnalyticsOptInActivity.kt @@ -7,6 +7,7 @@ package im.vector.app.features.analytics.ui.consent +import android.view.View import com.airbnb.mvrx.viewModel import dagger.hilt.android.AndroidEntryPoint import im.vector.app.core.extensions.addFragment @@ -29,6 +30,9 @@ class AnalyticsOptInActivity : VectorBaseActivity() { override fun getCoordinatorLayout() = views.coordinatorLayout + override val rootView: View + get() = views.coordinatorLayout + override fun initUiAndData() { orientationLocker.lockPhonesToPortrait(this) if (isFirstCreation()) { diff --git a/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewActivity.kt b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewActivity.kt index 487e116fb5..5382d54670 100644 --- a/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewActivity.kt +++ b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewActivity.kt @@ -9,6 +9,7 @@ package im.vector.app.features.attachments.preview import android.content.Context import android.content.Intent +import android.view.View import dagger.hilt.android.AndroidEntryPoint import im.vector.app.core.extensions.addFragment import im.vector.app.core.platform.VectorBaseActivity @@ -47,6 +48,9 @@ class AttachmentsPreviewActivity : VectorBaseActivity() { override fun getCoordinatorLayout() = views.coordinatorLayout + override val rootView: View + get() = views.coordinatorLayout + override fun initUiAndData() { if (isFirstCreation()) { val fragmentArgs: AttachmentsPreviewArgs = intent?.extras?.getParcelableCompat(EXTRA_FRAGMENT_ARGS) ?: return diff --git a/vector/src/main/java/im/vector/app/features/call/VectorCallActivity.kt b/vector/src/main/java/im/vector/app/features/call/VectorCallActivity.kt index 86ecfba6b6..03a3aaf8c9 100644 --- a/vector/src/main/java/im/vector/app/features/call/VectorCallActivity.kt +++ b/vector/src/main/java/im/vector/app/features/call/VectorCallActivity.kt @@ -187,6 +187,9 @@ class VectorCallActivity : override fun getMenuRes() = R.menu.vector_call + override val rootView: View + get() = views.constraintLayout + override fun onUserLeaveHint() { super.onUserLeaveHint() enterPictureInPictureIfRequired() diff --git a/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt b/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt index 4a0ccf28e3..a86b5e34c9 100644 --- a/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt +++ b/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt @@ -15,6 +15,7 @@ import android.content.res.Configuration import android.os.Build import android.os.Bundle import android.os.Parcelable +import android.view.View import android.widget.FrameLayout import android.widget.Toast import androidx.core.app.PictureInPictureModeChangedInfo @@ -58,6 +59,9 @@ class VectorJitsiActivity : VectorBaseActivity(), JitsiMee override fun getBinding() = ActivityJitsiBinding.inflate(layoutInflater) + override val rootView: View + get() = views.jitsiLayout + private var jitsiMeetView: JitsiMeetView? = null private val jitsiViewModel: JitsiCallViewModel by viewModel() diff --git a/vector/src/main/java/im/vector/app/features/call/transfer/CallTransferActivity.kt b/vector/src/main/java/im/vector/app/features/call/transfer/CallTransferActivity.kt index 6a647bd501..1925ce854e 100644 --- a/vector/src/main/java/im/vector/app/features/call/transfer/CallTransferActivity.kt +++ b/vector/src/main/java/im/vector/app/features/call/transfer/CallTransferActivity.kt @@ -11,6 +11,7 @@ import android.content.Context import android.content.Intent import android.os.Bundle import android.os.Parcelable +import android.view.View import com.airbnb.mvrx.Mavericks import com.airbnb.mvrx.viewModel import com.google.android.material.tabs.TabLayoutMediator @@ -37,6 +38,9 @@ class CallTransferActivity : VectorBaseActivity() { override fun getCoordinatorLayout() = views.vectorCoordinatorLayout + override val rootView: View + get() = views.vectorCoordinatorLayout + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) waitingView = views.waitingView.waitingView diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt index d22ea90856..bea9d1303b 100644 --- a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt +++ b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt @@ -192,6 +192,9 @@ class HomeActivity : override fun getCoordinatorLayout() = views.coordinatorLayout + override val rootView: View + get() = views.coordinatorLayout + override fun getBinding() = ActivityHomeBinding.inflate(layoutInflater) override fun onCreate(savedInstanceState: Bundle?) { diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailActivity.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailActivity.kt index 749092f20b..e5d785af63 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailActivity.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailActivity.kt @@ -81,6 +81,9 @@ class RoomDetailActivity : override fun getCoordinatorLayout() = views.coordinatorLayout + override val rootView: View + get() = views.coordinatorLayout + @Inject lateinit var playbackTracker: AudioMessagePlaybackTracker private lateinit var sharedActionViewModel: RoomDetailSharedActionViewModel private val requireActiveMembershipViewModel: RequireActiveMembershipViewModel by viewModel() diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt index 56db3a84ba..32f0c4e9c2 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt @@ -410,11 +410,11 @@ class TimelineFragment : } } - ViewCompat.setOnApplyWindowInsetsListener(views.coordinatorLayout) { _, insets -> - val imeInsets = insets.getInsets(WindowInsetsCompat.Type.ime()) - views.voiceMessageRecorderContainer.updatePadding(bottom = imeInsets.bottom) - insets - } + //ViewCompat.setOnApplyWindowInsetsListener(views.coordinatorLayout) { _, insets -> + // val imeInsets = insets.getInsets(WindowInsetsCompat.Type.ime()) + // views.voiceMessageRecorderContainer.updatePadding(bottom = imeInsets.bottom) + // insets + //} } private fun setupBackPressHandling() { diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchActivity.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchActivity.kt index 0d674174c8..f262f5b044 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchActivity.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchActivity.kt @@ -10,6 +10,7 @@ package im.vector.app.features.home.room.detail.search import android.content.Context import android.content.Intent import android.os.Bundle +import android.view.View import androidx.appcompat.widget.SearchView import com.airbnb.mvrx.Mavericks import dagger.hilt.android.AndroidEntryPoint @@ -30,6 +31,9 @@ class SearchActivity : VectorBaseActivity() { override fun getCoordinatorLayout() = views.coordinatorLayout + override val rootView: View + get() = views.coordinatorLayout + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setupToolbar(views.searchToolbar) diff --git a/vector/src/main/java/im/vector/app/features/home/room/filtered/FilteredRoomsActivity.kt b/vector/src/main/java/im/vector/app/features/home/room/filtered/FilteredRoomsActivity.kt index b2402ee439..7e10e69797 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/filtered/FilteredRoomsActivity.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/filtered/FilteredRoomsActivity.kt @@ -10,6 +10,7 @@ package im.vector.app.features.home.room.filtered import android.content.Context import android.content.Intent import android.os.Bundle +import android.view.View import androidx.appcompat.widget.SearchView import dagger.hilt.android.AndroidEntryPoint import im.vector.app.core.extensions.replaceFragment @@ -32,6 +33,9 @@ class FilteredRoomsActivity : VectorBaseActivity() override fun getCoordinatorLayout() = views.coordinatorLayout + override val rootView: View + get() = views.coordinatorLayout + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) analyticsScreenName = MobileScreen.ScreenName.RoomFilter diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/home/invites/InvitesActivity.kt b/vector/src/main/java/im/vector/app/features/home/room/list/home/invites/InvitesActivity.kt index f2a19545fe..8976e580c5 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/list/home/invites/InvitesActivity.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/list/home/invites/InvitesActivity.kt @@ -7,6 +7,7 @@ package im.vector.app.features.home.room.list.home.invites +import android.view.View import dagger.hilt.android.AndroidEntryPoint import im.vector.app.core.extensions.addFragment import im.vector.app.core.platform.VectorBaseActivity @@ -22,4 +23,8 @@ class InvitesActivity : VectorBaseActivity() { addFragment(views.simpleFragmentContainer, InvitesFragment::class.java) } } + + override fun getCoordinatorLayout() = views.coordinatorLayout + override val rootView: View + get() = views.coordinatorLayout } diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/home/release/ReleaseNotesActivity.kt b/vector/src/main/java/im/vector/app/features/home/room/list/home/release/ReleaseNotesActivity.kt index 0a3fa4393a..e7c104ff05 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/list/home/release/ReleaseNotesActivity.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/list/home/release/ReleaseNotesActivity.kt @@ -7,6 +7,7 @@ package im.vector.app.features.home.room.list.home.release +import android.view.View import androidx.lifecycle.lifecycleScope import dagger.hilt.android.AndroidEntryPoint import im.vector.app.core.extensions.addFragment @@ -26,6 +27,9 @@ class ReleaseNotesActivity : VectorBaseActivity() { override fun getCoordinatorLayout() = views.coordinatorLayout + override val rootView: View + get() = views.coordinatorLayout + override fun initUiAndData() { orientationLocker.lockPhonesToPortrait(this) if (isFirstCreation()) { diff --git a/vector/src/main/java/im/vector/app/features/home/room/threads/ThreadsActivity.kt b/vector/src/main/java/im/vector/app/features/home/room/threads/ThreadsActivity.kt index e0b773c2b6..9174f60e5b 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/threads/ThreadsActivity.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/threads/ThreadsActivity.kt @@ -10,6 +10,7 @@ package im.vector.app.features.home.room.threads import android.content.Context import android.content.Intent import android.os.Bundle +import android.view.View import androidx.fragment.app.FragmentTransaction import dagger.hilt.android.AndroidEntryPoint import im.vector.app.core.extensions.addFragmentToBackstack @@ -42,6 +43,9 @@ class ThreadsActivity : VectorBaseActivity() { override fun getCoordinatorLayout() = views.coordinatorLayout + override val rootView: View + get() = views.coordinatorLayout + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) initFragment() diff --git a/vector/src/main/java/im/vector/app/features/link/LinkHandlerActivity.kt b/vector/src/main/java/im/vector/app/features/link/LinkHandlerActivity.kt index 5c3ba3fbc3..f8c9057571 100644 --- a/vector/src/main/java/im/vector/app/features/link/LinkHandlerActivity.kt +++ b/vector/src/main/java/im/vector/app/features/link/LinkHandlerActivity.kt @@ -10,6 +10,7 @@ package im.vector.app.features.link import android.content.Intent import android.net.Uri import android.os.Bundle +import android.view.View import androidx.lifecycle.lifecycleScope import com.airbnb.mvrx.viewModel import com.google.android.material.dialog.MaterialAlertDialogBuilder @@ -41,6 +42,9 @@ class LinkHandlerActivity : VectorBaseActivity() { override fun getBinding() = ActivityProgressBinding.inflate(layoutInflater) + override val rootView: View + get() = views.mainRoot + override fun initUiAndData() { handleIntent() } diff --git a/vector/src/main/java/im/vector/app/features/location/LocationSharingActivity.kt b/vector/src/main/java/im/vector/app/features/location/LocationSharingActivity.kt index d9d3ee0731..70ef34d03b 100644 --- a/vector/src/main/java/im/vector/app/features/location/LocationSharingActivity.kt +++ b/vector/src/main/java/im/vector/app/features/location/LocationSharingActivity.kt @@ -10,6 +10,7 @@ package im.vector.app.features.location import android.content.Context import android.content.Intent import android.os.Parcelable +import android.view.View import dagger.hilt.android.AndroidEntryPoint import im.vector.app.core.extensions.addFragment import im.vector.app.core.platform.VectorBaseActivity @@ -31,6 +32,9 @@ class LocationSharingActivity : VectorBaseActivity(), UnlockedA override fun getCoordinatorLayout() = views.coordinatorLayout + override val rootView: View + get() = views.coordinatorLayout + override fun initUiAndData() { analyticsScreenName = MobileScreen.ScreenName.Login diff --git a/vector/src/main/java/im/vector/app/features/media/BigImageViewerActivity.kt b/vector/src/main/java/im/vector/app/features/media/BigImageViewerActivity.kt index 05c331d1d0..57d631b5be 100644 --- a/vector/src/main/java/im/vector/app/features/media/BigImageViewerActivity.kt +++ b/vector/src/main/java/im/vector/app/features/media/BigImageViewerActivity.kt @@ -10,6 +10,7 @@ package im.vector.app.features.media import android.content.Context import android.content.Intent import android.os.Bundle +import android.view.View import androidx.core.net.toUri import dagger.hilt.android.AndroidEntryPoint import im.vector.app.core.di.ActiveSessionHolder @@ -26,6 +27,9 @@ class BigImageViewerActivity : VectorBaseActivity override fun getBinding() = ActivityBigImageViewerBinding.inflate(layoutInflater) + override val rootView: View + get() = views.mainRoot + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingActivity.kt b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingActivity.kt index f62989fec6..dd8d287bad 100644 --- a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingActivity.kt +++ b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingActivity.kt @@ -10,6 +10,7 @@ package im.vector.app.features.onboarding import android.content.Context import android.content.Intent import android.net.Uri +import android.view.View import dagger.hilt.android.AndroidEntryPoint import im.vector.app.core.extensions.lazyViewModel import im.vector.app.core.extensions.validateBackPressed @@ -33,6 +34,9 @@ class OnboardingActivity : VectorBaseActivity(), UnlockedA override fun getCoordinatorLayout() = views.coordinatorLayout + override val rootView: View + get() = views.coordinatorLayout + override fun onNewIntent(intent: Intent) { super.onNewIntent(intent) onboardingVariant.onNewIntent(intent) diff --git a/vector/src/main/java/im/vector/app/features/pin/PinActivity.kt b/vector/src/main/java/im/vector/app/features/pin/PinActivity.kt index a002bc0329..b5c70fddd9 100644 --- a/vector/src/main/java/im/vector/app/features/pin/PinActivity.kt +++ b/vector/src/main/java/im/vector/app/features/pin/PinActivity.kt @@ -9,6 +9,7 @@ package im.vector.app.features.pin import android.content.Context import android.content.Intent +import android.view.View import com.airbnb.mvrx.Mavericks import dagger.hilt.android.AndroidEntryPoint import im.vector.app.core.extensions.addFragment @@ -31,6 +32,9 @@ class PinActivity : VectorBaseActivity(), UnlockedActivit override fun getCoordinatorLayout() = views.coordinatorLayout + override val rootView: View + get() = views.coordinatorLayout + override fun initUiAndData() { if (isFirstCreation()) { val fragmentArgs: PinArgs = intent?.extras?.getParcelableCompat(Mavericks.KEY_ARG) ?: return diff --git a/vector/src/main/java/im/vector/app/features/qrcode/QrCodeScannerActivity.kt b/vector/src/main/java/im/vector/app/features/qrcode/QrCodeScannerActivity.kt index d2f8016bda..5325a3f043 100644 --- a/vector/src/main/java/im/vector/app/features/qrcode/QrCodeScannerActivity.kt +++ b/vector/src/main/java/im/vector/app/features/qrcode/QrCodeScannerActivity.kt @@ -10,6 +10,7 @@ package im.vector.app.features.qrcode import android.app.Activity import android.content.Intent import android.os.Bundle +import android.view.View import android.widget.Toast import androidx.activity.result.ActivityResultLauncher import com.airbnb.mvrx.viewModel @@ -26,6 +27,9 @@ class QrCodeScannerActivity : VectorBaseActivity() { override fun getCoordinatorLayout() = views.coordinatorLayout + override val rootView: View + get() = views.coordinatorLayout + private val qrViewModel: QrCodeScannerViewModel by viewModel() override fun onCreate(savedInstanceState: Bundle?) { diff --git a/vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt b/vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt index 71b5895573..b4024fa124 100755 --- a/vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt +++ b/vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt @@ -11,6 +11,7 @@ import android.content.Context import android.content.Intent import android.view.Menu import android.view.MenuItem +import android.view.View import android.widget.Toast import androidx.core.view.isVisible import androidx.core.widget.doOnTextChanged @@ -37,6 +38,9 @@ class BugReportActivity : private val viewModel: BugReportViewModel by viewModel() + override val rootView: View + get() = views.mainRoot + private var reportType: ReportType = ReportType.BUG_REPORT override fun initUiAndData() { diff --git a/vector/src/main/java/im/vector/app/features/reactions/EmojiReactionPickerActivity.kt b/vector/src/main/java/im/vector/app/features/reactions/EmojiReactionPickerActivity.kt index 7cd7b79b11..774b41245c 100644 --- a/vector/src/main/java/im/vector/app/features/reactions/EmojiReactionPickerActivity.kt +++ b/vector/src/main/java/im/vector/app/features/reactions/EmojiReactionPickerActivity.kt @@ -13,6 +13,7 @@ import android.graphics.Typeface import android.util.TypedValue import android.view.Menu import android.view.MenuItem +import android.view.View import android.widget.SearchView import androidx.core.view.isVisible import androidx.lifecycle.lifecycleScope @@ -55,6 +56,9 @@ class EmojiReactionPickerActivity : override fun getCoordinatorLayout() = views.coordinatorLayout + override val rootView: View + get() = views.coordinatorLayout + override fun getTitleRes() = CommonStrings.title_activity_emoji_reaction_picker @Inject lateinit var emojiCompatFontProvider: EmojiCompatFontProvider diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryActivity.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryActivity.kt index 3940404af9..8a1c75ad61 100644 --- a/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryActivity.kt +++ b/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryActivity.kt @@ -10,6 +10,7 @@ package im.vector.app.features.roomdirectory import android.content.Context import android.content.Intent import android.os.Bundle +import android.view.View import androidx.lifecycle.lifecycleScope import com.airbnb.mvrx.viewModel import com.airbnb.mvrx.withState @@ -41,6 +42,9 @@ class RoomDirectoryActivity : VectorBaseActivity(), Matri override fun getCoordinatorLayout() = views.coordinatorLayout + override val rootView: View + get() = views.coordinatorLayout + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) analyticsScreenName = MobileScreen.ScreenName.RoomDirectory diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomActivity.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomActivity.kt index c3ba0e7041..90be84d848 100644 --- a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomActivity.kt +++ b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomActivity.kt @@ -11,6 +11,7 @@ import android.app.Activity import android.content.Context import android.content.Intent import android.os.Bundle +import android.view.View import androidx.lifecycle.lifecycleScope import com.airbnb.mvrx.Mavericks import dagger.hilt.android.AndroidEntryPoint @@ -36,6 +37,9 @@ class CreateRoomActivity : VectorBaseActivity() { override fun getCoordinatorLayout() = views.coordinatorLayout + override val rootView: View + get() = views.coordinatorLayout + override fun initUiAndData() { if (isFirstCreation()) { val fragmentArgs: CreateRoomArgs = intent?.extras?.getParcelableCompat(Mavericks.KEY_ARG) ?: return diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewActivity.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewActivity.kt index 77bac7dfa1..b6859f36df 100644 --- a/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewActivity.kt +++ b/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewActivity.kt @@ -10,6 +10,7 @@ package im.vector.app.features.roomdirectory.roompreview import android.content.Context import android.content.Intent import android.os.Parcelable +import android.view.View import dagger.hilt.android.AndroidEntryPoint import im.vector.app.core.extensions.addFragment import im.vector.app.core.platform.VectorBaseActivity @@ -73,6 +74,9 @@ class RoomPreviewActivity : VectorBaseActivity() { override fun getCoordinatorLayout() = views.coordinatorLayout + override val rootView: View + get() = views.simpleFragmentContainer + override fun initUiAndData() { if (isFirstCreation()) { val args = intent.getParcelableExtraCompat(ARG) diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileActivity.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileActivity.kt index cf593c039e..43ee03fd58 100644 --- a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileActivity.kt +++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileActivity.kt @@ -9,6 +9,7 @@ package im.vector.app.features.roommemberprofile import android.content.Context import android.content.Intent +import android.view.View import android.widget.Toast import com.airbnb.mvrx.Mavericks import com.airbnb.mvrx.viewModel @@ -37,6 +38,11 @@ class RoomMemberProfileActivity : VectorBaseActivity() { return ActivitySimpleBinding.inflate(layoutInflater) } + override fun getCoordinatorLayout() = views.coordinatorLayout + + override val rootView: View + get() = views.coordinatorLayout + override fun initUiAndData() { if (isFirstCreation()) { val fragmentArgs: RoomMemberProfileArgs = intent?.extras?.getParcelableCompat(Mavericks.KEY_ARG) ?: return diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt index 5bbfab6e18..db5cd3b9cb 100644 --- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt @@ -9,6 +9,7 @@ package im.vector.app.features.roomprofile import android.content.Context import android.content.Intent +import android.view.View import android.widget.Toast import androidx.lifecycle.lifecycleScope import com.airbnb.mvrx.Mavericks @@ -68,6 +69,9 @@ class RoomProfileActivity : override fun getCoordinatorLayout() = views.coordinatorLayout + override val rootView: View + get() = views.coordinatorLayout + override fun initUiAndData() { sharedActionViewModel = viewModelProvider.get(RoomProfileSharedActionViewModel::class.java) roomProfileArgs = intent?.extras?.getParcelableCompat(Mavericks.KEY_ARG) ?: return diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/ui/RoomPollDetailActivity.kt b/vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/ui/RoomPollDetailActivity.kt index dc3db0401e..a8a1c31862 100644 --- a/vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/ui/RoomPollDetailActivity.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/ui/RoomPollDetailActivity.kt @@ -10,6 +10,7 @@ package im.vector.app.features.roomprofile.polls.detail.ui import android.content.Context import android.content.Intent import android.os.Bundle +import android.view.View import com.airbnb.mvrx.Mavericks import dagger.hilt.android.AndroidEntryPoint import im.vector.app.core.extensions.addFragment @@ -25,6 +26,11 @@ class RoomPollDetailActivity : VectorBaseActivity() { override fun getBinding() = ActivitySimpleBinding.inflate(layoutInflater) + override fun getCoordinatorLayout() = views.coordinatorLayout + + override val rootView: View + get() = views.coordinatorLayout + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleActivity.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleActivity.kt index 30d2e688b6..868564737f 100644 --- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleActivity.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleActivity.kt @@ -10,6 +10,7 @@ package im.vector.app.features.roomprofile.settings.joinrule import android.content.Context import android.content.Intent import android.os.Bundle +import android.view.View import androidx.core.view.isVisible import com.airbnb.mvrx.Fail import com.airbnb.mvrx.Loading @@ -40,6 +41,11 @@ class RoomJoinRuleActivity : VectorBaseActivity() { override fun getBinding() = ActivitySimpleBinding.inflate(layoutInflater) + override fun getCoordinatorLayout() = views.coordinatorLayout + + override val rootView: View + get() = views.coordinatorLayout + private lateinit var roomProfileArgs: RoomProfileArgs val viewModel: RoomJoinRuleChooseRestrictedViewModel by viewModel() diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsActivity.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsActivity.kt index 62d0917490..c942d8f06a 100755 --- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsActivity.kt +++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsActivity.kt @@ -11,6 +11,7 @@ import android.content.Context import android.content.Intent import android.os.Bundle import android.os.Parcelable +import android.view.View import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.preference.Preference @@ -47,6 +48,9 @@ class VectorSettingsActivity : VectorBaseActivity override fun getCoordinatorLayout() = views.coordinatorLayout + override val rootView: View + get() = views.coordinatorLayout + override fun getTitleRes() = CommonStrings.title_activity_settings private var keyToHighlight: String? = null diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/rename/RenameSessionActivity.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/rename/RenameSessionActivity.kt index 3625dee311..7a556e18eb 100644 --- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/rename/RenameSessionActivity.kt +++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/rename/RenameSessionActivity.kt @@ -10,6 +10,7 @@ package im.vector.app.features.settings.devices.v2.rename import android.content.Context import android.content.Intent import android.os.Bundle +import android.view.View import android.view.WindowManager import com.airbnb.mvrx.Mavericks import dagger.hilt.android.AndroidEntryPoint @@ -26,6 +27,11 @@ class RenameSessionActivity : VectorBaseActivity() { override fun getBinding() = ActivitySimpleBinding.inflate(layoutInflater) + override fun getCoordinatorLayout() = views.coordinatorLayout + + override val rootView: View + get() = views.coordinatorLayout + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/vector/src/main/java/im/vector/app/features/settings/font/FontScaleSettingActivity.kt b/vector/src/main/java/im/vector/app/features/settings/font/FontScaleSettingActivity.kt index d2e8ffccbf..1ffb93d840 100644 --- a/vector/src/main/java/im/vector/app/features/settings/font/FontScaleSettingActivity.kt +++ b/vector/src/main/java/im/vector/app/features/settings/font/FontScaleSettingActivity.kt @@ -7,6 +7,7 @@ package im.vector.app.features.settings.font +import android.view.View import dagger.hilt.android.AndroidEntryPoint import im.vector.app.core.extensions.addFragment import im.vector.app.core.platform.VectorBaseActivity @@ -17,6 +18,11 @@ class FontScaleSettingActivity : VectorBaseActivity() { override fun getBinding() = ActivitySimpleBinding.inflate(layoutInflater) + override fun getCoordinatorLayout() = views.coordinatorLayout + + override val rootView: View + get() = views.coordinatorLayout + override fun initUiAndData() { if (isFirstCreation()) { addFragment(views.simpleFragmentContainer, FontScaleSettingFragment::class.java) diff --git a/vector/src/main/java/im/vector/app/features/share/IncomingShareActivity.kt b/vector/src/main/java/im/vector/app/features/share/IncomingShareActivity.kt index e2a00c516f..3d89a6ebc9 100644 --- a/vector/src/main/java/im/vector/app/features/share/IncomingShareActivity.kt +++ b/vector/src/main/java/im/vector/app/features/share/IncomingShareActivity.kt @@ -9,6 +9,7 @@ package im.vector.app.features.share import android.content.Intent import android.os.Bundle +import android.view.View import com.airbnb.mvrx.viewModel import dagger.hilt.android.AndroidEntryPoint import im.vector.app.core.extensions.addFragment @@ -46,6 +47,9 @@ class IncomingShareActivity : VectorBaseActivity() { override fun getCoordinatorLayout() = views.coordinatorLayout + override val rootView: View + get() = views.coordinatorLayout + private fun handleAppStarted() { // If we are not logged in, stop the sharing process and open login screen. // In the future, we might want to relaunch the sharing process after login. diff --git a/vector/src/main/java/im/vector/app/features/signout/hard/SignedOutActivity.kt b/vector/src/main/java/im/vector/app/features/signout/hard/SignedOutActivity.kt index c94d9ab7b9..e6b3b817ea 100644 --- a/vector/src/main/java/im/vector/app/features/signout/hard/SignedOutActivity.kt +++ b/vector/src/main/java/im/vector/app/features/signout/hard/SignedOutActivity.kt @@ -10,6 +10,7 @@ package im.vector.app.features.signout.hard import android.content.Context import android.content.Intent import android.os.Bundle +import android.view.View import dagger.hilt.android.AndroidEntryPoint import im.vector.app.core.platform.VectorBaseActivity import im.vector.app.databinding.ActivitySignedOutBinding @@ -26,6 +27,9 @@ class SignedOutActivity : VectorBaseActivity() { override fun getBinding() = ActivitySignedOutBinding.inflate(layoutInflater) + override val rootView: View + get() = views.signedOut + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceExploreActivity.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceExploreActivity.kt index 5f060adeb9..7e5d776ca2 100644 --- a/vector/src/main/java/im/vector/app/features/spaces/SpaceExploreActivity.kt +++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceExploreActivity.kt @@ -11,6 +11,7 @@ import android.app.Activity import android.content.Context import android.content.Intent import android.os.Bundle +import android.view.View import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import com.airbnb.mvrx.Mavericks @@ -38,6 +39,11 @@ class SpaceExploreActivity : VectorBaseActivity(), Matrix override fun getBinding(): ActivitySimpleBinding = ActivitySimpleBinding.inflate(layoutInflater) + override fun getCoordinatorLayout() = views.coordinatorLayout + + override val rootView: View + get() = views.coordinatorLayout + override fun getTitleRes(): Int = CommonStrings.space_explore_activity_title val sharedViewModel: SpaceDirectoryViewModel by viewModel() diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpacePreviewActivity.kt b/vector/src/main/java/im/vector/app/features/spaces/SpacePreviewActivity.kt index d698f2ed35..6b60253b4a 100644 --- a/vector/src/main/java/im/vector/app/features/spaces/SpacePreviewActivity.kt +++ b/vector/src/main/java/im/vector/app/features/spaces/SpacePreviewActivity.kt @@ -10,6 +10,7 @@ package im.vector.app.features.spaces import android.content.Context import android.content.Intent import android.os.Bundle +import android.view.View import androidx.lifecycle.lifecycleScope import com.airbnb.mvrx.Mavericks import dagger.hilt.android.AndroidEntryPoint @@ -29,6 +30,11 @@ class SpacePreviewActivity : VectorBaseActivity() { override fun getBinding(): ActivitySimpleBinding = ActivitySimpleBinding.inflate(layoutInflater) + override fun getCoordinatorLayout() = views.coordinatorLayout + + override val rootView: View + get() = views.coordinatorLayout + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) sharedActionViewModel = viewModelProvider.get(SpacePreviewSharedActionViewModel::class.java) diff --git a/vector/src/main/java/im/vector/app/features/spaces/leave/SpaceLeaveAdvancedActivity.kt b/vector/src/main/java/im/vector/app/features/spaces/leave/SpaceLeaveAdvancedActivity.kt index cf7b706adf..84c3c78b2a 100644 --- a/vector/src/main/java/im/vector/app/features/spaces/leave/SpaceLeaveAdvancedActivity.kt +++ b/vector/src/main/java/im/vector/app/features/spaces/leave/SpaceLeaveAdvancedActivity.kt @@ -10,6 +10,7 @@ package im.vector.app.features.spaces.leave import android.content.Context import android.content.Intent import android.os.Bundle +import android.view.View import androidx.core.view.isGone import androidx.core.view.isVisible import com.airbnb.mvrx.Fail @@ -33,6 +34,11 @@ class SpaceLeaveAdvancedActivity : VectorBaseActivity() { override fun getBinding(): ActivitySimpleLoadingBinding = ActivitySimpleLoadingBinding.inflate(layoutInflater) + override fun getCoordinatorLayout() = views.coordinatorLayout + + override val rootView: View + get() = views.coordinatorLayout + override fun getTitleRes(): Int = CommonStrings.space_add_existing_rooms val sharedViewModel: SpaceManageSharedViewModel by viewModel() diff --git a/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleActivity.kt b/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleActivity.kt index 7a12dedd56..4bb2f0c44a 100644 --- a/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleActivity.kt +++ b/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleActivity.kt @@ -10,6 +10,7 @@ package im.vector.app.features.spaces.people import android.content.Context import android.content.Intent import android.os.Bundle +import android.view.View import androidx.core.view.isGone import androidx.core.view.isVisible import androidx.lifecycle.lifecycleScope @@ -32,6 +33,11 @@ class SpacePeopleActivity : VectorBaseActivity() { override fun getBinding() = ActivitySimpleLoadingBinding.inflate(layoutInflater) + override fun getCoordinatorLayout() = views.coordinatorLayout + + override val rootView: View + get() = views.coordinatorLayout + private lateinit var sharedActionViewModel: SpacePeopleSharedActionViewModel override fun initUiAndData() { diff --git a/vector/src/main/java/im/vector/app/features/usercode/UserCodeActivity.kt b/vector/src/main/java/im/vector/app/features/usercode/UserCodeActivity.kt index 06fc143e21..7b27ffdd1e 100644 --- a/vector/src/main/java/im/vector/app/features/usercode/UserCodeActivity.kt +++ b/vector/src/main/java/im/vector/app/features/usercode/UserCodeActivity.kt @@ -11,6 +11,7 @@ import android.content.Context import android.content.Intent import android.os.Bundle import android.os.Parcelable +import android.view.View import android.widget.Toast import androidx.core.app.ActivityCompat import androidx.core.view.isVisible @@ -51,6 +52,9 @@ class UserCodeActivity : VectorBaseActivity(), override fun getCoordinatorLayout() = views.coordinatorLayout + override val rootView: View + get() = views.coordinatorLayout + private val fragmentLifecycleCallbacks = object : FragmentManager.FragmentLifecycleCallbacks() { override fun onFragmentResumed(fm: FragmentManager, f: Fragment) { if (f is MatrixToBottomSheet) { diff --git a/vector/src/main/java/im/vector/app/features/webview/VectorWebViewActivity.kt b/vector/src/main/java/im/vector/app/features/webview/VectorWebViewActivity.kt index 7af0dc62dc..6e7cb9e468 100644 --- a/vector/src/main/java/im/vector/app/features/webview/VectorWebViewActivity.kt +++ b/vector/src/main/java/im/vector/app/features/webview/VectorWebViewActivity.kt @@ -9,6 +9,7 @@ package im.vector.app.features.webview import android.content.Context import android.content.Intent +import android.view.View import android.webkit.WebChromeClient import android.webkit.WebView import dagger.hilt.android.AndroidEntryPoint @@ -28,6 +29,9 @@ class VectorWebViewActivity : VectorBaseActivity() override fun getBinding() = ActivityVectorWebViewBinding.inflate(layoutInflater) + override val rootView: View + get() = views.mainRoot + val session: Session by lazy { activeSessionHolder.getActiveSession() } diff --git a/vector/src/main/java/im/vector/app/features/widgets/WidgetActivity.kt b/vector/src/main/java/im/vector/app/features/widgets/WidgetActivity.kt index 099f39f67a..917fc02440 100644 --- a/vector/src/main/java/im/vector/app/features/widgets/WidgetActivity.kt +++ b/vector/src/main/java/im/vector/app/features/widgets/WidgetActivity.kt @@ -20,6 +20,7 @@ import android.content.IntentFilter import android.graphics.drawable.Icon import android.os.Build import android.util.Rational +import android.view.View import androidx.annotation.RequiresApi import androidx.core.app.PictureInPictureModeChangedInfo import androidx.core.content.ContextCompat @@ -77,6 +78,9 @@ class WidgetActivity : VectorBaseActivity() { override fun getBinding() = ActivityWidgetBinding.inflate(layoutInflater) + override val rootView: View + get() = views.mainRoot + override fun getTitleRes() = CommonStrings.room_widget_activity_title override fun initUiAndData() { diff --git a/vector/src/main/res/layout/activity_big_image_viewer.xml b/vector/src/main/res/layout/activity_big_image_viewer.xml index 8f1cf88aff..cd254db50d 100644 --- a/vector/src/main/res/layout/activity_big_image_viewer.xml +++ b/vector/src/main/res/layout/activity_big_image_viewer.xml @@ -1,6 +1,7 @@ @@ -28,4 +29,4 @@ app:layout_constraintTop_toBottomOf="@id/appBarLayout" app:optimizeDisplay="true" /> - \ No newline at end of file + diff --git a/vector/src/main/res/layout/activity_bug_report.xml b/vector/src/main/res/layout/activity_bug_report.xml index 1c019c858d..799ab2fb5f 100644 --- a/vector/src/main/res/layout/activity_bug_report.xml +++ b/vector/src/main/res/layout/activity_bug_report.xml @@ -2,6 +2,7 @@ diff --git a/vector/src/main/res/layout/activity_call.xml b/vector/src/main/res/layout/activity_call.xml index 5734e5f92a..02c90f8e54 100644 --- a/vector/src/main/res/layout/activity_call.xml +++ b/vector/src/main/res/layout/activity_call.xml @@ -97,7 +97,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@android:color/transparent" - android:fitsSystemWindows="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" diff --git a/vector/src/main/res/layout/activity_location_sharing.xml b/vector/src/main/res/layout/activity_location_sharing.xml index bbb46de8c7..9e44c72c83 100755 --- a/vector/src/main/res/layout/activity_location_sharing.xml +++ b/vector/src/main/res/layout/activity_location_sharing.xml @@ -1,5 +1,6 @@ @@ -21,4 +22,4 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> - \ No newline at end of file + diff --git a/vector/src/main/res/layout/activity_main.xml b/vector/src/main/res/layout/activity_main.xml index ba5925f000..626eb100d4 100644 --- a/vector/src/main/res/layout/activity_main.xml +++ b/vector/src/main/res/layout/activity_main.xml @@ -3,6 +3,7 @@ diff --git a/vector/src/main/res/layout/activity_widget.xml b/vector/src/main/res/layout/activity_widget.xml index b278bb5a1a..f1222d11df 100755 --- a/vector/src/main/res/layout/activity_widget.xml +++ b/vector/src/main/res/layout/activity_widget.xml @@ -1,6 +1,7 @@ @@ -23,4 +24,4 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> - \ No newline at end of file + diff --git a/vector/src/main/res/layout/fragment_generic_recycler.xml b/vector/src/main/res/layout/fragment_generic_recycler.xml index 472f05092e..1c2eb2fc40 100644 --- a/vector/src/main/res/layout/fragment_generic_recycler.xml +++ b/vector/src/main/res/layout/fragment_generic_recycler.xml @@ -2,6 +2,7 @@ diff --git a/vector/src/main/res/layout/fragment_new_home_detail.xml b/vector/src/main/res/layout/fragment_new_home_detail.xml index d20223a382..32d1dfc5d2 100644 --- a/vector/src/main/res/layout/fragment_new_home_detail.xml +++ b/vector/src/main/res/layout/fragment_new_home_detail.xml @@ -45,7 +45,6 @@ android:id="@+id/appBarLayout" android:layout_width="match_parent" android:layout_height="wrap_content" - android:fitsSystemWindows="true" app:layout_constraintTop_toBottomOf="@id/syncStateView">