filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use MaterialToolbar and AppBarLayout in all screens

This commit is contained in:
Benoit Marty 2021-06-10 20:25:00 +02:00 committed by Benoit Marty
parent 8162d1100d
commit 3473d669d3
53 changed files with 956 additions and 874 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/check/forbidden_strings_in_resources.txt
View File

@ -98,6 +98,10 @@ layout_constraintLeft_
### Use com.google.android.material.switchmaterial.SwitchMaterial instead of Switch, the inflater will not automatically inflate Material Views for Switch.
<Switch
### Use com.google.android.material.appbar.MaterialToolbar instead of Toolbar, the inflater will not automatically inflate Material Views for Toolbar.
<Toolbar
<androidx\.appcompat\.widget\.Toolbar
### Use colorSecondary
colorAccent

4
tools/templates/ElementFeature/root/src/app_package/Activity.kt.ftl
View File

@ -2,7 +2,7 @@ package ${escapeKotlinIdentifiers(packageName)}
import android.content.Context
import android.content.Intent
import androidx.appcompat.widget.Toolbar
import com.google.android.material.appbar.MaterialToolbar
import im.vector.app.R
import im.vector.app.core.extensions.addFragment
import im.vector.app.core.platform.ToolbarConfigurable
@ -42,7 +42,7 @@ class ${activityClass} : VectorBaseActivity(), ToolbarConfigurable {
}
}
override fun configure(toolbar: Toolbar) {
override fun configure(toolbar: MaterialToolbar) {
configureToolbar(toolbar)
}

12
vector/src/debug/res/layout/activity_test_material_theme.xml
View File

@ -12,7 +12,13 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.appcompat.widget.Toolbar
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBarLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/debug_toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -20,13 +26,15 @@
app:subtitle="Toolbar Subtitle"
app:title="Toolbar Title" />
</com.google.android.material.appbar.AppBarLayout>
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/debug_toolbar">
app:layout_constraintTop_toBottomOf="@+id/appBarLayout">
<LinearLayout
android:layout_width="match_parent"

4
vector/src/main/java/im/vector/app/core/platform/ToolbarConfigurable.kt
View File

@ -16,9 +16,9 @@
package im.vector.app.core.platform
import androidx.appcompat.widget.Toolbar
import com.google.android.material.appbar.MaterialToolbar
interface ToolbarConfigurable {
fun configure(toolbar: Toolbar)
fun configure(toolbar: MaterialToolbar)
}

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

@ -32,7 +32,7 @@ import androidx.annotation.MainThread
import androidx.annotation.MenuRes
import androidx.annotation.StringRes
import androidx.appcompat.app.AppCompatActivity
import androidx.appcompat.widget.Toolbar
import com.google.android.material.appbar.MaterialToolbar
import androidx.coordinatorlayout.widget.CoordinatorLayout
import androidx.core.content.ContextCompat
import androidx.core.view.isVisible
@ -519,7 +519,7 @@ abstract class VectorBaseActivity<VB: ViewBinding> : AppCompatActivity(), HasScr
/**
* Configure the Toolbar, with default back button.
*/
protected fun configureToolbar(toolbar: Toolbar, displayBack: Boolean = true) {
protected fun configureToolbar(toolbar: MaterialToolbar, displayBack: Boolean = true) {
setSupportActionBar(toolbar)
supportActionBar?.let {
it.setDisplayShowHomeEnabled(displayBack)

4
vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt
View File

@ -29,7 +29,7 @@ import android.view.View
import android.view.ViewGroup
import androidx.annotation.CallSuper
import androidx.annotation.MainThread
import androidx.appcompat.widget.Toolbar
import com.google.android.material.appbar.MaterialToolbar
import androidx.lifecycle.ViewModelProvider
import androidx.viewbinding.ViewBinding
import com.airbnb.mvrx.BaseMvRxFragment
@ -224,7 +224,7 @@ abstract class VectorBaseFragment<VB: ViewBinding> : BaseMvRxFragment(), HasScre
/**
* Configure the Toolbar.
*/
protected fun setupToolbar(toolbar: Toolbar) {
protected fun setupToolbar(toolbar: MaterialToolbar) {
val parentActivity = vectorBaseActivity
if (parentActivity is ToolbarConfigurable) {
parentActivity.configure(toolbar)

4
vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewActivity.kt
View File

@ -19,7 +19,7 @@ package im.vector.app.features.attachments.preview
import android.content.Context
import android.content.Intent
import androidx.appcompat.widget.Toolbar
import com.google.android.material.appbar.MaterialToolbar
import im.vector.app.R
import im.vector.app.core.extensions.addFragment
import im.vector.app.core.platform.ToolbarConfigurable
@ -72,7 +72,7 @@ class AttachmentsPreviewActivity : VectorBaseActivity<ActivitySimpleBinding>(),
finish()
}
override fun configure(toolbar: Toolbar) {
override fun configure(toolbar: MaterialToolbar) {
configureToolbar(toolbar)
}
}

4
vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
View File

@ -24,7 +24,7 @@ import android.os.Bundle
import android.os.Parcelable
import android.view.Menu
import android.view.MenuItem
import androidx.appcompat.widget.Toolbar
import com.google.android.material.appbar.MaterialToolbar
import androidx.core.view.GravityCompat
import androidx.core.view.isVisible
import androidx.drawerlayout.widget.DrawerLayout
@ -437,7 +437,7 @@ class HomeActivity :
serverBackupStatusViewModel.refreshRemoteStateIfNeeded()
}
override fun configure(toolbar: Toolbar) {
override fun configure(toolbar: MaterialToolbar) {
configureToolbar(toolbar, false)
}

4
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailActivity.kt
View File

@ -20,7 +20,7 @@ import android.content.Context
import android.content.Intent
import android.os.Bundle
import android.widget.Toast
import androidx.appcompat.widget.Toolbar
import com.google.android.material.appbar.MaterialToolbar
import androidx.core.view.GravityCompat
import androidx.drawerlayout.widget.DrawerLayout
import com.airbnb.mvrx.viewModel
@ -132,7 +132,7 @@ class RoomDetailActivity :
super.onDestroy()
}
override fun configure(toolbar: Toolbar) {
override fun configure(toolbar: MaterialToolbar) {
configureToolbar(toolbar)
}

4
vector/src/main/java/im/vector/app/features/login/LoginActivity.kt
View File

@ -21,7 +21,7 @@ import android.content.Intent
import android.view.View
import android.view.ViewGroup
import androidx.annotation.CallSuper
import androidx.appcompat.widget.Toolbar
import com.google.android.material.appbar.MaterialToolbar
import androidx.core.view.ViewCompat
import androidx.core.view.children
import androidx.core.view.isVisible
@ -356,7 +356,7 @@ open class LoginActivity : VectorBaseActivity<ActivityLoginBinding>(), ToolbarCo
}
}
override fun configure(toolbar: Toolbar) {
override fun configure(toolbar: MaterialToolbar) {
configureToolbar(toolbar)
}

4
vector/src/main/java/im/vector/app/features/login2/LoginActivity2.kt
View File

@ -21,7 +21,7 @@ import android.content.Intent
import android.view.View
import android.view.ViewGroup
import androidx.annotation.CallSuper
import androidx.appcompat.widget.Toolbar
import com.google.android.material.appbar.MaterialToolbar
import androidx.core.view.ViewCompat
import androidx.core.view.children
import androidx.core.view.isVisible
@ -388,7 +388,7 @@ open class LoginActivity2 : VectorBaseActivity<ActivityLoginBinding>(), ToolbarC
}
}
override fun configure(toolbar: Toolbar) {
override fun configure(toolbar: MaterialToolbar) {
configureToolbar(toolbar)
}

4
vector/src/main/java/im/vector/app/features/pin/PinActivity.kt
View File

@ -18,7 +18,7 @@ package im.vector.app.features.pin
import android.content.Context
import android.content.Intent
import androidx.appcompat.widget.Toolbar
import com.google.android.material.appbar.MaterialToolbar
import com.airbnb.mvrx.MvRx
import im.vector.app.R
import im.vector.app.core.extensions.addFragment
@ -47,7 +47,7 @@ class PinActivity : VectorBaseActivity<ActivitySimpleBinding>(), ToolbarConfigur
}
}
override fun configure(toolbar: Toolbar) {
override fun configure(toolbar: MaterialToolbar) {
configureToolbar(toolbar)
}
}

5
vector/src/main/java/im/vector/app/features/reactions/EmojiReactionPickerActivity.kt
View File

@ -24,7 +24,6 @@ import android.view.Menu
import android.view.MenuInflater
import android.view.MenuItem
import android.widget.SearchView
import androidx.appcompat.widget.Toolbar
import androidx.core.view.isVisible
import com.airbnb.mvrx.viewModel
import com.google.android.material.tabs.TabLayout
@ -150,13 +149,13 @@ class EmojiReactionPickerActivity : VectorBaseActivity<ActivityEmojiReactionPick
searchView.isIconified = false
searchView.requestFocusFromTouch()
// we want to force the tool bar as visible even if hidden with scroll flags
findViewById<Toolbar>(R.id.toolbar)?.minimumHeight = getActionBarSize()
views.emojiPickerToolbar.minimumHeight = getActionBarSize()
return true
}
override fun onMenuItemActionCollapse(p0: MenuItem?): Boolean {
// when back, clear all search
findViewById<Toolbar>(R.id.toolbar)?.minimumHeight = 0
views.emojiPickerToolbar.minimumHeight = 0
searchView.setQuery("", true)
return true
}

4
vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomActivity.kt
View File

@ -19,7 +19,7 @@ package im.vector.app.features.roomdirectory.createroom
import android.content.Context
import android.content.Intent
import android.os.Bundle
import androidx.appcompat.widget.Toolbar
import com.google.android.material.appbar.MaterialToolbar
import im.vector.app.R
import im.vector.app.core.di.ScreenComponent
import im.vector.app.core.extensions.addFragment
@ -40,7 +40,7 @@ class CreateRoomActivity : VectorBaseActivity<ActivitySimpleBinding>(), ToolbarC
override fun getCoordinatorLayout() = views.coordinatorLayout
override fun configure(toolbar: Toolbar) {
override fun configure(toolbar: MaterialToolbar) {
configureToolbar(toolbar)
}

4
vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewActivity.kt
View File

@ -19,7 +19,7 @@ package im.vector.app.features.roomdirectory.roompreview
import android.content.Context
import android.content.Intent
import android.os.Parcelable
import androidx.appcompat.widget.Toolbar
import com.google.android.material.appbar.MaterialToolbar
import im.vector.app.R
import im.vector.app.core.extensions.addFragment
import im.vector.app.core.platform.ToolbarConfigurable
@ -77,7 +77,7 @@ class RoomPreviewActivity : VectorBaseActivity<ActivitySimpleBinding>(), Toolbar
override fun getCoordinatorLayout() = views.coordinatorLayout
override fun configure(toolbar: Toolbar) {
override fun configure(toolbar: MaterialToolbar) {
configureToolbar(toolbar)
}

4
vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileActivity.kt
View File

@ -20,7 +20,7 @@ package im.vector.app.features.roommemberprofile
import android.content.Context
import android.content.Intent
import android.widget.Toast
import androidx.appcompat.widget.Toolbar
import com.google.android.material.appbar.MaterialToolbar
import com.airbnb.mvrx.MvRx
import com.airbnb.mvrx.viewModel
import im.vector.app.R
@ -77,7 +77,7 @@ class RoomMemberProfileActivity :
}
}
override fun configure(toolbar: Toolbar) {
override fun configure(toolbar: MaterialToolbar) {
configureToolbar(toolbar)
}

4
vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
View File

@ -20,7 +20,7 @@ package im.vector.app.features.roomprofile
import android.content.Context
import android.content.Intent
import android.widget.Toast
import androidx.appcompat.widget.Toolbar
import com.google.android.material.appbar.MaterialToolbar
import com.airbnb.mvrx.MvRx
import com.airbnb.mvrx.viewModel
import im.vector.app.R
@ -162,7 +162,7 @@ class RoomProfileActivity :
addFragmentToBackstack(R.id.simpleFragmentContainer, RoomBannedMemberListFragment::class.java, roomProfileArgs)
}
override fun configure(toolbar: Toolbar) {
override fun configure(toolbar: MaterialToolbar) {
configureToolbar(toolbar)
}
}

4
vector/src/main/java/im/vector/app/features/share/IncomingShareActivity.kt
View File

@ -16,7 +16,7 @@
package im.vector.app.features.share
import androidx.appcompat.widget.Toolbar
import com.google.android.material.appbar.MaterialToolbar
import im.vector.app.R
import im.vector.app.core.extensions.addFragment
import im.vector.app.core.platform.ToolbarConfigurable
@ -35,7 +35,7 @@ class IncomingShareActivity : VectorBaseActivity<ActivitySimpleBinding>(), Toolb
}
}
override fun configure(toolbar: Toolbar) {
override fun configure(toolbar: MaterialToolbar) {
configureToolbar(toolbar, displayBack = false)
}
}

4
vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageActivity.kt
View File

@ -20,7 +20,7 @@ import android.content.Context
import android.content.Intent
import android.os.Bundle
import android.os.Parcelable
import androidx.appcompat.widget.Toolbar
import com.google.android.material.appbar.MaterialToolbar
import androidx.core.view.isGone
import androidx.core.view.isVisible
import com.airbnb.mvrx.MvRx
@ -169,7 +169,7 @@ class SpaceManageActivity : VectorBaseActivity<ActivitySimpleLoadingBinding>(),
override fun create(initialState: SpaceManageViewState) = sharedViewModelFactory.create(initialState)
override fun configure(toolbar: Toolbar) {
override fun configure(toolbar: MaterialToolbar) {
configureToolbar(toolbar)
}
}

4
vector/src/main/java/im/vector/app/features/widgets/WidgetActivity.kt
View File

@ -19,7 +19,7 @@ package im.vector.app.features.widgets
import android.app.Activity
import android.content.Context
import android.content.Intent
import androidx.appcompat.widget.Toolbar
import com.google.android.material.appbar.MaterialToolbar
import androidx.core.view.isVisible
import com.airbnb.mvrx.MvRx
import com.airbnb.mvrx.viewModel
@ -150,7 +150,7 @@ class WidgetActivity : VectorBaseActivity<ActivityWidgetBinding>(),
finish()
}
override fun configure(toolbar: Toolbar) {
override fun configure(toolbar: MaterialToolbar) {
configureToolbar(toolbar)
}
}

15
vector/src/main/res/layout/activity.xml
View File

@ -9,11 +9,18 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBarLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</com.google.android.material.appbar.AppBarLayout>
<androidx.fragment.app.FragmentContainerView
android:id="@+id/container"
@ -22,7 +29,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/toolbar" />
app:layout_constraintTop_toBottomOf="@id/appBarLayout" />
<include
android:id="@+id/waiting_view"

17
vector/src/main/res/layout/activity_big_image_viewer.xml
View File

@ -4,13 +4,18 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.appcompat.widget.Toolbar
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBarLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/bigImageViewerToolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
android:layout_height="?attr/actionBarSize" />
</com.google.android.material.appbar.AppBarLayout>
<com.github.piasy.biv.view.BigImageView
android:id="@+id/bigImageViewerImageView"
@ -20,7 +25,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/bigImageViewerToolbar"
app:layout_constraintTop_toBottomOf="@+id/appBarLayout"
app:optimizeDisplay="true" />
</androidx.constraintlayout.widget.ConstraintLayout>

8
vector/src/main/res/layout/activity_bug_report.xml
View File

@ -6,11 +6,17 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<androidx.appcompat.widget.Toolbar
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/bugReportToolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</com.google.android.material.appbar.AppBarLayout>
<LinearLayout
android:id="@+id/bug_report_body_view"
android:layout_width="match_parent"

16
vector/src/main/res/layout/activity_call_transfer.xml
View File

@ -9,21 +9,27 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.appcompat.widget.Toolbar
android:id="@+id/callTransferToolbar"
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBarLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/callTransferToolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<com.google.android.material.tabs.TabLayout
android:id="@+id/callTransferTabLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@+id/callTransferToolbar"
app:tabGravity="fill"
app:tabMaxWidth="0dp"
app:tabMode="fixed" />
</com.google.android.material.appbar.AppBarLayout>
<androidx.viewpager2.widget.ViewPager2
android:id="@+id/callTransferViewPager"
android:layout_width="0dp"
@ -32,7 +38,7 @@
app:layout_constraintBottom_toTopOf="@+id/callTransferActionsLayout"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/callTransferTabLayout" />
app:layout_constraintTop_toBottomOf="@id/appBarLayout" />
<RelativeLayout
android:id="@+id/callTransferActionsLayout"

7
vector/src/main/res/layout/activity_emoji_reaction_picker.xml
View File

@ -26,14 +26,12 @@
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:elevation="4dp">
android:layout_height="wrap_content">
<androidx.appcompat.widget.Toolbar
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/emojiPickerToolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:elevation="0dp"
android:minHeight="0dp"
app:layout_scrollFlags="scroll|exitUntilCollapsed|snap|enterAlways"
tools:title="@string/reactions" />
@ -45,5 +43,4 @@
</com.google.android.material.appbar.AppBarLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

23
vector/src/main/res/layout/activity_filtered_rooms.xml
View File

@ -9,15 +9,18 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.appcompat.widget.Toolbar
android:id="@+id/filteredRoomsToolbar"
android:layout_width="0dp"
android:layout_height="?attr/actionBarSize"
app:contentInsetStart="0dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBarLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/filteredRoomsToolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:contentInsetStart="0dp">
<androidx.appcompat.widget.SearchView
android:id="@+id/filteredRoomsSearchView"
style="@style/VectorSearchView"
@ -26,7 +29,9 @@
app:queryHint="@string/room_filtering_filter_hint"
app:searchIcon="@drawable/ic_filter" />
</androidx.appcompat.widget.Toolbar>
</com.google.android.material.appbar.MaterialToolbar>
</com.google.android.material.appbar.AppBarLayout>
<androidx.fragment.app.FragmentContainerView
android:id="@+id/filteredRoomsFragmentContainer"
@ -35,7 +40,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/filteredRoomsToolbar" />
app:layout_constraintTop_toBottomOf="@+id/appBarLayout" />
</androidx.constraintlayout.widget.ConstraintLayout>

23
vector/src/main/res/layout/activity_incoming_share.xml
View File

@ -9,15 +9,18 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.appcompat.widget.Toolbar
android:id="@+id/incomingShareToolbar"
android:layout_width="0dp"
android:layout_height="?attr/actionBarSize"
app:contentInsetStart="0dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBarLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/incomingShareToolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:contentInsetStart="0dp">
<androidx.appcompat.widget.SearchView
android:id="@+id/incomingShareSearchView"
style="@style/VectorSearchView"
@ -26,7 +29,9 @@
app:queryHint="@string/room_filtering_filter_hint"
app:searchIcon="@drawable/ic_filter" />
</androidx.appcompat.widget.Toolbar>
</com.google.android.material.appbar.MaterialToolbar>
</com.google.android.material.appbar.AppBarLayout>
<androidx.fragment.app.FragmentContainerView
android:id="@+id/shareRoomListFragmentContainer"
@ -35,7 +40,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/incomingShareToolbar" />
app:layout_constraintTop_toBottomOf="@+id/appBarLayout" />
</androidx.constraintlayout.widget.ConstraintLayout>

23
vector/src/main/res/layout/activity_search.xml
View File

@ -9,15 +9,18 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.appcompat.widget.Toolbar
android:id="@+id/searchToolbar"
android:layout_width="0dp"
android:layout_height="?attr/actionBarSize"
app:contentInsetStart="0dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBarLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/searchToolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:contentInsetStart="0dp">
<androidx.appcompat.widget.SearchView
android:id="@+id/searchView"
style="@style/VectorSearchView"
@ -26,7 +29,9 @@
android:backgroundTint="@color/base_color"
app:queryHint="@string/search_hint" />
</androidx.appcompat.widget.Toolbar>
</com.google.android.material.appbar.MaterialToolbar>
</com.google.android.material.appbar.AppBarLayout>
<androidx.fragment.app.FragmentContainerView
android:id="@+id/searchFragmentContainer"
@ -35,7 +40,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/searchToolbar" />
app:layout_constraintTop_toBottomOf="@+id/appBarLayout" />
</androidx.constraintlayout.widget.ConstraintLayout>

9
vector/src/main/res/layout/activity_vector_settings.xml
View File

@ -10,8 +10,13 @@
android:layout_height="match_parent"
android:orientation="vertical">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBarLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<!-- Use VectorToolbarSettings on this screen for better alignment with setting items -->
<androidx.appcompat.widget.Toolbar
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/settingsToolbar"
style="@style/VectorToolbarSettings"
android:layout_width="match_parent"
@ -19,6 +24,8 @@
tools:navigationIcon="@drawable/ic_back_24dp"
tools:title="Title" />
</com.google.android.material.appbar.AppBarLayout>
<FrameLayout
android:id="@+id/vector_settings_page"
android:layout_width="match_parent"

13
vector/src/main/res/layout/activity_vector_web_view.xml
View File

@ -6,19 +6,26 @@
android:layout_height="match_parent"
tools:context=".features.webview.VectorWebViewActivity">
<androidx.appcompat.widget.Toolbar
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBarLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/webview_toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:layout_constraintTop_toTopOf="parent"
tools:title="Title of the web page" />
</com.google.android.material.appbar.AppBarLayout>
<WebView
android:id="@+id/simple_webview"
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/webview_toolbar" />
app:layout_constraintTop_toBottomOf="@+id/appBarLayout" />
<ProgressBar
android:id="@+id/simple_webview_loader"

11
vector/src/main/res/layout/activity_widget.xml
View File

@ -1,14 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<androidx.appcompat.widget.Toolbar
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBarLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</com.google.android.material.appbar.AppBarLayout>
<FrameLayout
android:id="@+id/fragmentContainer"
android:layout_width="match_parent"

19
vector/src/main/res/layout/fragment_attachments_preview.xml
View File

@ -15,18 +15,25 @@
app:layout_constraintTop_toTopOf="parent"
tools:listitem="@layout/item_attachment_big_preview" />
<androidx.appcompat.widget.Toolbar
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBarLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#40000000"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/attachmentPreviewerToolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="#40000000"
android:elevation="0dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:background="@android:color/transparent"
app:titleTextColor="@android:color/white"
tools:title="Title" />
</com.google.android.material.appbar.AppBarLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/attachmentPreviewerBottomContainer"
android:layout_width="match_parent"

50
vector/src/main/res/layout/fragment_contacts_book.xml
View File

@ -10,14 +10,17 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.appcompat.widget.Toolbar
android:id="@+id/phoneBookToolbar"
android:layout_width="0dp"
android:layout_height="?actionBarSize"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBarLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/phoneBookToolbar"
android:layout_width="match_parent"
android:layout_height="?actionBarSize">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
@ -56,18 +59,15 @@
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.appcompat.widget.Toolbar>
</com.google.android.material.appbar.MaterialToolbar>
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/phoneBookFilterContainer"
android:layout_width="0dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/layout_horizontal_margin"
android:layout_marginTop="16dp"
android:layout_marginEnd="@dimen/layout_horizontal_margin"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/phoneBookToolbar">
android:layout_marginEnd="@dimen/layout_horizontal_margin">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/phoneBookFilter"
@ -79,16 +79,13 @@
<CheckBox
android:id="@+id/phoneBookOnlyBoundContacts"
android:layout_width="0dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/layout_horizontal_margin"
android:layout_marginTop="4dp"
android:layout_marginEnd="@dimen/layout_horizontal_margin"
android:text="@string/matrix_only_filter"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/phoneBookFilterContainer"
tools:visibility="visible" />
<Button
@ -101,26 +98,9 @@
android:layout_marginEnd="@dimen/layout_horizontal_margin"
android:text="@string/phone_book_perform_lookup"
android:visibility="gone"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/phoneBookFilterContainer"
tools:visibility="visible" />
<androidx.constraintlayout.widget.Barrier
android:id="@+id/phoneBookBottomBarrier"
android:layout_width="0dp"
android:layout_height="0dp"
app:barrierDirection="bottom"
app:constraint_referenced_ids="phoneBookSearchForMatrixContacts,phoneBookOnlyBoundContacts" />
<View
android:id="@+id/phoneBookFilterDivider"
android:layout_width="0dp"
android:layout_height="1dp"
android:layout_marginTop="4dp"
android:background="?vctr_list_separator"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/phoneBookBottomBarrier" />
</com.google.android.material.appbar.AppBarLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/phoneBookRecyclerView"
@ -132,7 +112,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/phoneBookFilterDivider"
app:layout_constraintTop_toBottomOf="@+id/appBarLayout"
tools:listitem="@layout/item_contact_main" />
</androidx.constraintlayout.widget.ConstraintLayout>

36
vector/src/main/res/layout/fragment_create_direct_room_directory_users.xml
View File

@ -10,14 +10,17 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.appcompat.widget.Toolbar
android:id="@+id/createRoomToolbar"
android:layout_width="0dp"
android:layout_height="?actionBarSize"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBarLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/createRoomToolbar"
android:layout_width="match_parent"
android:layout_height="?actionBarSize">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
@ -56,18 +59,16 @@
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.appcompat.widget.Toolbar>
</com.google.android.material.appbar.MaterialToolbar>
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/createDirectRoomSearchByIdContainer"
android:layout_width="0dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/layout_horizontal_margin"
android:layout_marginTop="16dp"
android:layout_marginEnd="@dimen/layout_horizontal_margin"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/createRoomToolbar">
android:layout_marginBottom="16dp">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/createDirectRoomSearchById"
@ -77,28 +78,19 @@
</com.google.android.material.textfield.TextInputLayout>
<View
android:id="@+id/createDirectRoomFilterDivider"
android:layout_width="0dp"
android:layout_height="1dp"
android:layout_marginTop="16dp"
android:background="?vctr_list_separator"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/createDirectRoomSearchByIdContainer" />
</com.google.android.material.appbar.AppBarLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/createDirectRoomRecyclerView"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginTop="16dp"
android:fastScrollEnabled="true"
android:overScrollMode="always"
android:scrollbars="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/createDirectRoomFilterDivider"
app:layout_constraintTop_toBottomOf="@+id/appBarLayout"
tools:listitem="@layout/item_create_direct_room_user" />
</androidx.constraintlayout.widget.ConstraintLayout>

22
vector/src/main/res/layout/fragment_create_room.xml
View File

@ -10,15 +10,17 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.appcompat.widget.Toolbar
android:id="@+id/createRoomToolbar"
android:layout_width="0dp"
android:layout_height="?actionBarSize"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBarLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/createRoomToolbar"
android:layout_width="match_parent"
android:layout_height="?actionBarSize">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
@ -54,7 +56,9 @@
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.appcompat.widget.Toolbar>
</com.google.android.material.appbar.MaterialToolbar>
</com.google.android.material.appbar.AppBarLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/createRoomForm"
@ -63,7 +67,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/createRoomToolbar"
app:layout_constraintTop_toBottomOf="@+id/appBarLayout"
tools:listitem="@layout/item_form_switch" />
</androidx.constraintlayout.widget.ConstraintLayout>

21
vector/src/main/res/layout/fragment_home_detail.xml
View File

@ -1,17 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.appcompat.widget.Toolbar
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBarLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/groupToolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent">
android:layout_height="?attr/actionBarSize">
<LinearLayout
android:layout_width="match_parent"
@ -59,6 +62,7 @@
tools:background="@drawable/bg_unread_highlight"
tools:text="4"
tools:visibility="visible" />
</RelativeLayout>
<LinearLayout
@ -98,10 +102,11 @@
</LinearLayout>
</LinearLayout>
</androidx.appcompat.widget.Toolbar>
</com.google.android.material.appbar.MaterialToolbar>
</com.google.android.material.appbar.AppBarLayout>
<im.vector.app.features.sync.widget.SyncStateView
android:id="@+id/syncStateView"
@ -109,7 +114,7 @@
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/groupToolbar" />
app:layout_constraintTop_toBottomOf="@+id/appBarLayout" />
<im.vector.app.core.ui.views.KeysBackupBanner
android:id="@+id/homeKeysBackupBanner"

23
vector/src/main/res/layout/fragment_incoming_share.xml
View File

@ -10,15 +10,18 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.appcompat.widget.Toolbar
android:id="@+id/incomingShareToolbar"
android:layout_width="0dp"
android:layout_height="?attr/actionBarSize"
app:contentInsetStart="0dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBarLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/incomingShareToolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:contentInsetStart="0dp">
<androidx.appcompat.widget.SearchView
android:id="@+id/incomingShareSearchView"
style="@style/VectorSearchView"
@ -27,7 +30,9 @@
app:queryHint="@string/room_filtering_filter_hint"
app:searchIcon="@drawable/ic_filter" />
</androidx.appcompat.widget.Toolbar>
</com.google.android.material.appbar.MaterialToolbar>
</com.google.android.material.appbar.AppBarLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/incomingShareRoomList"
@ -36,7 +41,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/incomingShareToolbar"
app:layout_constraintTop_toBottomOf="@+id/appBarLayout"
tools:listitem="@layout/item_room" />
<com.google.android.material.floatingactionbutton.FloatingActionButton

11
vector/src/main/res/layout/fragment_login_web.xml
View File

@ -1,18 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?android:colorBackground"
android:orientation="vertical">
<androidx.appcompat.widget.Toolbar
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBarLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/loginWebToolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:subtitle="https://www.example.org"
tools:title="@string/auth_login" />
</com.google.android.material.appbar.AppBarLayout>
<WebView
android:id="@+id/loginWebWebView"
android:layout_width="match_parent"

4
vector/src/main/res/layout/fragment_matrix_profile.xml
View File

@ -33,7 +33,7 @@
app:layout_collapseMode="parallax"
app:layout_collapseParallaxMultiplier="0.9" />
<androidx.appcompat.widget.Toolbar
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/matrixProfileToolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
@ -90,7 +90,7 @@
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.appcompat.widget.Toolbar>
</com.google.android.material.appbar.MaterialToolbar>
</com.google.android.material.appbar.CollapsingToolbarLayout>

12
vector/src/main/res/layout/fragment_public_rooms.xml
View File

@ -17,17 +17,13 @@
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:elevation="4dp">
android:layout_height="wrap_content">
<androidx.appcompat.widget.Toolbar
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/publicRoomsToolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:minHeight="0dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_scrollFlags="scroll|exitUntilCollapsed|snap|enterAlways">
<androidx.appcompat.widget.SearchView
@ -37,7 +33,7 @@
android:layout_height="wrap_content"
app:queryHint="@string/room_directory_search_hint" />
</androidx.appcompat.widget.Toolbar>
</com.google.android.material.appbar.MaterialToolbar>
<Button
android:id="@+id/publicRoomsCreateNewRoom"
@ -47,9 +43,9 @@
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:icon="@drawable/ic_plus_circle"
android:minHeight="@dimen/layout_touch_size"
android:text="@string/create_new_room"
app:icon="@drawable/ic_plus_circle"
app:iconPadding="13dp"
app:iconTint="?colorPrimary"
app:layout_constraintStart_toStartOf="parent"

7
vector/src/main/res/layout/fragment_recyclerview_with_search.xml
View File

@ -22,14 +22,11 @@
android:elevation="4dp">
<!-- minHeight="0dp" is important to collapse on scroll -->
<androidx.appcompat.widget.Toolbar
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/addRoomToSpaceToolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:minHeight="0dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_scrollFlags="scroll|exitUntilCollapsed|snap|enterAlways">
<LinearLayout
@ -65,7 +62,7 @@
</LinearLayout>
</androidx.appcompat.widget.Toolbar>
</com.google.android.material.appbar.MaterialToolbar>
<androidx.appcompat.widget.SearchView

23
vector/src/main/res/layout/fragment_room_detail.xml
View File

@ -6,15 +6,18 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.appcompat.widget.Toolbar
android:id="@+id/roomToolbar"
android:layout_width="0dp"
android:layout_height="?actionBarSize"
android:transitionName="toolbar"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBarLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/roomToolbar"
android:layout_width="match_parent"
android:layout_height="?actionBarSize"
android:transitionName="toolbar">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/roomToolbarContentView"
android:layout_width="match_parent"
@ -77,7 +80,9 @@
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.appcompat.widget.Toolbar>
</com.google.android.material.appbar.MaterialToolbar>
</com.google.android.material.appbar.AppBarLayout>
<androidx.constraintlayout.widget.Barrier
android:id="@+id/timelineRecyclerViewBarrier"
@ -92,7 +97,7 @@
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/roomToolbar" />
app:layout_constraintTop_toBottomOf="@id/appBarLayout" />
<im.vector.app.core.ui.views.CurrentCallsView
android:id="@+id/activeCallView"

14
vector/src/main/res/layout/fragment_room_directory_picker.xml
View File

@ -9,8 +9,7 @@
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:elevation="4dp">
android:layout_height="wrap_content">
<com.google.android.material.appbar.CollapsingToolbarLayout
android:id="@+id/spaceExploreCollapsingToolbarLayout"
@ -32,17 +31,14 @@
<include
android:id="@+id/spaceCard"
layout="@layout/fragment_matrix_to_room_space_card" />
</FrameLayout>
<androidx.appcompat.widget.Toolbar
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_collapseMode="pin"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_collapseMode="pin" />
</com.google.android.material.appbar.CollapsingToolbarLayout>
@ -51,9 +47,9 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/roomDirectoryPickerList"
android:background="?android:colorBackground"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?android:colorBackground"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:listitem="@layout/item_room_directory" />

11
vector/src/main/res/layout/fragment_room_preview_no_preview.xml
View File

@ -11,7 +11,12 @@
android:layout_height="match_parent"
android:orientation="vertical">
<androidx.appcompat.widget.Toolbar
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBarLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/roomPreviewNoPreviewToolbar"
android:layout_width="match_parent"
android:layout_height="?actionBarSize">
@ -51,7 +56,7 @@
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.appcompat.widget.Toolbar>
</com.google.android.material.appbar.MaterialToolbar>
<ProgressBar
android:id="@+id/roomPreviewPeekingProgress"
@ -61,6 +66,8 @@
android:layout_gravity="center"
android:indeterminate="true" />
</com.google.android.material.appbar.AppBarLayout>
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">

16
vector/src/main/res/layout/fragment_room_setting_generic.xml
View File

@ -7,14 +7,18 @@
android:layout_height="match_parent"
android:background="?android:colorBackground">
<androidx.appcompat.widget.Toolbar
android:id="@+id/roomSettingsToolbar"
android:layout_width="0dp"
android:layout_height="?actionBarSize"
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/roomSettingsToolbar"
android:layout_width="match_parent"
android:layout_height="?actionBarSize">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/roomSettingsToolbarContentView"
android:layout_width="match_parent"
@ -59,7 +63,9 @@
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.appcompat.widget.Toolbar>
</com.google.android.material.appbar.MaterialToolbar>
</com.google.android.material.appbar.AppBarLayout>
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:id="@+id/coordinatorLayout"

6
vector/src/main/res/layout/fragment_room_uploads.xml
View File

@ -10,14 +10,12 @@
android:id="@+id/roomUploadsAppBar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:elevation="4dp"
android:transitionName="toolbar">
<androidx.appcompat.widget.Toolbar
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/roomUploadsToolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/transparent"
app:layout_collapseMode="pin">
<androidx.constraintlayout.widget.ConstraintLayout
@ -64,7 +62,7 @@
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.appcompat.widget.Toolbar>
</com.google.android.material.appbar.MaterialToolbar>
<com.google.android.material.tabs.TabLayout
android:id="@+id/roomUploadsTabs"

13
vector/src/main/res/layout/fragment_space_add_rooms.xml
View File

@ -17,18 +17,14 @@
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:elevation="4dp">
android:layout_height="wrap_content">
<!-- minHeight="0dp" is important to collapse on scroll -->
<androidx.appcompat.widget.Toolbar
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/addRoomToSpaceToolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:minHeight="0dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_scrollFlags="scroll|exitUntilCollapsed|snap|enterAlways">
<LinearLayout
@ -64,7 +60,7 @@
</LinearLayout>
</androidx.appcompat.widget.Toolbar>
</com.google.android.material.appbar.MaterialToolbar>
<androidx.appcompat.widget.SearchView
@ -93,7 +89,8 @@
app:iconPadding="13dp"
app:iconTint="?colorPrimary"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/addRoomToSpaceToolbar" />
app:layout_constraintTop_toBottomOf="@+id/addRoomToSpaceToolbar"
tools:ignore="MissingPrefix" />
</com.google.android.material.appbar.AppBarLayout>

11
vector/src/main/res/layout/fragment_space_preview.xml
View File

@ -11,7 +11,12 @@
android:layout_height="match_parent"
android:orientation="vertical">
<androidx.appcompat.widget.Toolbar
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBarLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/roomPreviewNoPreviewToolbar"
android:layout_width="match_parent"
android:layout_height="?actionBarSize"
@ -65,7 +70,7 @@
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.appcompat.widget.Toolbar>
</com.google.android.material.appbar.MaterialToolbar>
<ProgressBar
android:id="@+id/spacePreviewPeekingProgress"
@ -75,6 +80,8 @@
android:layout_gravity="center"
android:indeterminate="true" />
</com.google.android.material.appbar.AppBarLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/spacePreviewRecyclerView"
android:layout_width="match_parent"

24
vector/src/main/res/layout/fragment_user_code_show.xml
View File

@ -9,14 +9,17 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.appcompat.widget.Toolbar
android:id="@+id/showUserCodeToolBar"
android:layout_width="0dp"
android:layout_height="?actionBarSize"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBarLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/showUserCodeToolBar"
android:layout_width="match_parent"
android:layout_height="?actionBarSize">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
@ -52,7 +55,9 @@
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.appcompat.widget.Toolbar>
</com.google.android.material.appbar.MaterialToolbar>
</com.google.android.material.appbar.AppBarLayout>
<ImageView
@ -86,7 +91,7 @@
app:cardCornerRadius="20dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/showUserCodeToolBar"
app:layout_constraintTop_toBottomOf="@+id/appBarLayout"
app:layout_constraintWidth_percent="0.8">
<androidx.constraintlayout.widget.ConstraintLayout
@ -177,7 +182,8 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/showUserCodeInfoText"
app:layout_constraintVertical_bias="0" />
app:layout_constraintVertical_bias="0"
tools:ignore="MissingPrefix" />
<Button
android:id="@+id/showUserCodeScanButton"

35
vector/src/main/res/layout/fragment_user_directory.xml
View File

@ -10,14 +10,17 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.appcompat.widget.Toolbar
android:id="@+id/userDirectoryToolbar"
android:layout_width="0dp"
android:layout_height="?actionBarSize"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBarLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/userDirectoryToolbar"
android:layout_width="match_parent"
android:layout_height="?actionBarSize">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
@ -56,18 +59,19 @@
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.appcompat.widget.Toolbar>
</com.google.android.material.appbar.MaterialToolbar>
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/userDirectorySearchByIdContainer"
android:layout_width="0dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/layout_horizontal_margin"
android:layout_marginTop="16dp"
android:layout_marginEnd="@dimen/layout_horizontal_margin"
android:layout_marginBottom="16dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/userDirectoryToolbar">
app:layout_constraintTop_toBottomOf="@+id/appBarLayout">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/userDirectorySearchById"
@ -77,28 +81,19 @@
</com.google.android.material.textfield.TextInputLayout>
<View
android:id="@+id/userDirectoryFilterDivider"
android:layout_width="0dp"
android:layout_height="1dp"
android:layout_marginTop="16dp"
android:background="?vctr_list_separator"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/userDirectorySearchByIdContainer" />
</com.google.android.material.appbar.AppBarLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/userDirectoryRecyclerView"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginTop="16dp"
android:fastScrollEnabled="true"
android:overScrollMode="always"
android:scrollbars="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/userDirectoryFilterDivider"
app:layout_constraintTop_toBottomOf="@+id/appBarLayout"
tools:listitem="@layout/item_known_user" />
</androidx.constraintlayout.widget.ConstraintLayout>

24
vector/src/main/res/layout/fragment_user_list.xml
View File

@ -5,18 +5,17 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.constraintlayout.widget.ConstraintLayout
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBarLayout"
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.appcompat.widget.Toolbar
android:id="@+id/userListToolbar"
android:layout_width="0dp"
android:layout_height="?actionBarSize"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/userListToolbar"
android:layout_width="match_parent"
android:layout_height="?actionBarSize">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
@ -55,7 +54,9 @@
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.appcompat.widget.Toolbar>
</com.google.android.material.appbar.MaterialToolbar>
</com.google.android.material.appbar.AppBarLayout>
<im.vector.app.core.platform.MaxHeightScrollView
android:id="@+id/chipGroupScrollView"
@ -66,7 +67,7 @@
android:layout_marginEnd="@dimen/layout_horizontal_margin"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/userListToolbar"
app:layout_constraintTop_toBottomOf="@+id/appBarLayout"
app:maxHeight="64dp">
<com.google.android.material.chip.ChipGroup
@ -134,5 +135,4 @@
app:layout_constraintTop_toBottomOf="@+id/userListE2EbyDefaultDisabled"
tools:listitem="@layout/item_known_user" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

4
vector/src/main/res/values/styles_riot.xml
View File

@ -14,10 +14,6 @@
<item name="colorControlNormal">?colorSecondary</item>
</style>
<style name="VectorAppBarLayoutStyle" parent="Widget.MaterialComponents.AppBarLayout.Primary">
<item name="android:background">?android:colorBackground</item>
</style>
<style name="VectorAlertDialogStyleLight" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog">
<item name="colorPrimary">@color/palette_element_green</item>
<item name="colorSecondary">@color/palette_element_green</item>

8
vector/src/main/res/values/styles_toolbar.xml
View File

@ -1,10 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="VectorAppBarLayoutStyle" parent="Widget.MaterialComponents.AppBarLayout.Primary">
<item name="android:background">?vctr_toolbar_background</item>
<item name="elevation">4dp</item>
</style>
<style name="VectorToolbarBase" parent="Widget.MaterialComponents.Toolbar">
<item name="android:background">?vctr_toolbar_background</item>
<item name="android:elevation">4dp</item>
<item name="elevation">0dp</item>
<!-- main text -->
<item name="titleTextStyle">@style/ActionBarTitleText</item>