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 5ca5b62d1e..77d4f997f0 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 @@ -50,6 +50,7 @@ import androidx.viewbinding.ViewBinding import com.airbnb.mvrx.MavericksView import com.bumptech.glide.util.Util import com.google.android.material.appbar.MaterialToolbar +import com.google.android.material.color.MaterialColors import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.snackbar.Snackbar import dagger.hilt.android.EntryPointAccessors @@ -72,6 +73,7 @@ import im.vector.app.core.utils.ToolbarConfig import im.vector.app.core.utils.toast import im.vector.app.features.MainActivity import im.vector.app.features.MainActivityArgs +import im.vector.app.features.VectorFeatures import im.vector.app.features.analytics.AnalyticsTracker import im.vector.app.features.analytics.plan.MobileScreen import im.vector.app.features.configuration.VectorConfiguration @@ -161,6 +163,9 @@ abstract class VectorBaseActivity : AppCompatActivity(), Maver @Inject lateinit var fontScalePreferences: FontScalePreferences + @Inject + lateinit var vectorFeatures: VectorFeatures + lateinit var navigator: Navigator private set private lateinit var fragmentFactory: FragmentFactory @@ -253,6 +258,14 @@ abstract class VectorBaseActivity : AppCompatActivity(), Maver initUiAndData() + if (vectorFeatures.isNewAppLayoutEnabled()) { + tryOrNull { // TODO: Add to XML theme when feature flag is removed + val toolbarBackground = MaterialColors.getColor(views.root, R.attr.vctr_toolbar_background) + window.statusBarColor = toolbarBackground + window.navigationBarColor = toolbarBackground + } + } + val titleRes = getTitleRes() if (titleRes != -1) { supportActionBar?.let { 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 1bf96a60ed..81cd158321 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 @@ -126,7 +126,6 @@ class HomeActivity : @Inject lateinit var pushManager: PushersManager @Inject lateinit var notificationDrawerManager: NotificationDrawerManager @Inject lateinit var vectorPreferences: VectorPreferences - @Inject lateinit var vectorFeatures: VectorFeatures @Inject lateinit var popupAlertManager: PopupAlertManager @Inject lateinit var shortcutsHandler: ShortcutsHandler @Inject lateinit var permalinkHandler: PermalinkHandler