rei-forks
/
element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adds shadows and max list size to modal

This commit is contained in:
ericdecanini 2022-05-10 13:00:18 +02:00
parent 4fe455c47b
commit 1bca6f83ee
5 changed files with 105 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vector/src/main/java/im/vector/app/features/home/SpaceListModalFragment.kt
View File

@ -69,7 +69,7 @@ class SpaceListModalFragment : VectorBaseFragment<FragmentSpaceListModalBinding>
} }
private fun setupAddSpace() { private fun setupAddSpace() {
binding.addSpaceClickbox.setOnClickListener { binding.addSpaceLayout.setOnClickListener {
val currentSpace = sharedActionViewModel.space.value val currentSpace = sharedActionViewModel.space.value
if (currentSpace != null) { if (currentSpace != null) {
startActivity(SpaceManageActivity.newIntent(requireActivity(), currentSpace.roomId, ManageType.AddRoomsOnlySpaces)) startActivity(SpaceManageActivity.newIntent(requireActivity(), currentSpace.roomId, ManageType.AddRoomsOnlySpaces))
@ -82,14 +82,13 @@ class SpaceListModalFragment : VectorBaseFragment<FragmentSpaceListModalBinding>
private fun observeSpaceChange() = sharedActionViewModel.space.observe(viewLifecycleOwner) { private fun observeSpaceChange() = sharedActionViewModel.space.observe(viewLifecycleOwner) {
viewModel.setSpace(it) viewModel.setSpace(it)
binding.headerText.isVisible = it == null binding.headerText.isVisible = it == null
binding.headerTextLayout.isVisible = it == null
binding.bottomDivider.isVisible = !it?.spaceChildren.isNullOrEmpty()
} }
override fun invalidate() { override fun invalidate() {
withState(viewModel) { state -> withState(viewModel) { state ->
state.rootSpacesOrdered?.let { state.rootSpacesOrdered?.let {
(binding.roomList.adapter as SpaceListAdapter).replaceList(it) (binding.roomList.adapter as SpaceListAdapter).replaceList(it + it)
} }
} }
} }

12
vector/src/main/res/drawable/bg_modal_ripple_grey.xml Normal file
View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?attr/vctr_content_secondary">
<item android:drawable="@color/modal_background_color"/>
<!--this creates the mask with the ripple effect-->
<item
android:id="@+id/mask"
android:drawable="@android:color/white" />
</ripple>

7
vector/src/main/res/drawable/top_shadow.xml Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:startColor="#10000000"
android:endColor="@android:color/transparent"
android:angle="90" />
</shape>

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

@ -267,9 +267,17 @@
android:id="@+id/space_modal_fragment" android:id="@+id/space_modal_fragment"
android:name="im.vector.app.features.home.SpaceListModalFragment" android:name="im.vector.app.features.home.SpaceListModalFragment"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="@id/bottom_guideline"
android:elevation="0dp" android:elevation="0dp"
android:visibility="gone" android:visibility="gone"
app:layout_constraintTop_toBottomOf="@id/appBarLayout" /> app:layout_constraintTop_toBottomOf="@id/appBarLayout" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/bottom_guideline"
android:layout_width="0dp"
android:layout_height="0dp"
android:orientation="horizontal"
app:layout_constraintGuide_percent="0.75" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

135
vector/src/main/res/layout/fragment_space_list_modal.xml
View File

@ -3,82 +3,95 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:background="@drawable/bg_space_modal"> android:background="@drawable/bg_space_modal">
<TextView <FrameLayout
android:id="@+id/header_text" android:id="@+id/header_text_layout"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="16dp"
android:textSize="13sp"
android:textColor="?attr/vctr_content_tertiary"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent" android:background="@color/modal_background_color"
android:layout_marginStart="16dp" android:elevation="4dp"
android:text="@string/choose_a_space" android:paddingBottom="8dp">
android:textAllCaps="true" />
<TextView
android:id="@+id/header_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="16dp"
android:textSize="13sp"
android:textColor="?attr/vctr_content_tertiary"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
android:layout_marginStart="16dp"
android:text="@string/choose_a_space"
android:textAllCaps="true" />
</FrameLayout>
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/room_list" android:id="@+id/room_list"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="0dp"
android:layout_marginTop="8dp" android:background="@color/modal_background_color"
app:layout_constraintTop_toBottomOf="@id/header_text" app:layout_constraintTop_toBottomOf="@id/header_text_layout"
app:layout_constraintBottom_toTopOf="@id/add_space_layout"
tools:itemCount="3" tools:itemCount="3"
tools:listitem="@layout/item_modal_space" /> tools:listitem="@layout/item_modal_space" />
<com.google.android.material.divider.MaterialDivider
android:id="@+id/bottom_divider"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="8dp"
app:layout_constraintTop_toBottomOf="@id/room_list" />
<View <View
android:id="@+id/add_space_clickbox"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="4dp"
android:background="@drawable/ripple_grey" android:background="@drawable/top_shadow"
app:layout_constraintTop_toBottomOf="@id/bottom_divider" app:layout_constraintBottom_toTopOf="@id/add_space_layout" />
app:layout_constraintBottom_toBottomOf="parent" />
<com.google.android.material.imageview.ShapeableImageView <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/add_space_icon_background" android:id="@+id/add_space_layout"
android:layout_width="42dp" android:layout_width="match_parent"
android:layout_height="42dp"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:background="#4D8D97A5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/bottom_divider"
app:shapeAppearanceOverlay="@style/SpaceListModalImageShapeOverlay" />
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:importantForAccessibility="no"
android:src="@drawable/ic_plus"
app:layout_constraintBottom_toBottomOf="@id/add_space_icon_background"
app:layout_constraintEnd_toEndOf="@id/add_space_icon_background"
app:layout_constraintStart_toStartOf="@id/add_space_icon_background"
app:layout_constraintTop_toTopOf="@id/add_space_icon_background"
app:tint="?attr/vctr_spoiler_background_color" />
<TextView
style="@style/Widget.Vector.TextView.Body.Medium"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="16dp" android:background="@drawable/bg_modal_ripple_grey"
android:text="@string/add_space" android:elevation="3dp"
android:textSize="17sp" app:layout_constraintBottom_toBottomOf="parent">
app:layout_constraintBottom_toBottomOf="@id/add_space_icon_background"
app:layout_constraintStart_toEndOf="@id/add_space_icon_background"
app:layout_constraintTop_toTopOf="@id/add_space_icon_background" />
<Space <com.google.android.material.imageview.ShapeableImageView
android:layout_width="match_parent" android:id="@+id/add_space_icon_background"
android:layout_height="16dp" android:layout_width="42dp"
app:layout_constraintTop_toBottomOf="@id/add_space_icon_background" /> android:layout_height="42dp"
android:layout_marginStart="16dp"
android:background="#4D8D97A5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:shapeAppearanceOverlay="@style/SpaceListModalImageShapeOverlay" />
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:importantForAccessibility="no"
android:src="@drawable/ic_plus"
app:layout_constraintBottom_toBottomOf="@id/add_space_icon_background"
app:layout_constraintEnd_toEndOf="@id/add_space_icon_background"
app:layout_constraintStart_toStartOf="@id/add_space_icon_background"
app:layout_constraintTop_toTopOf="@id/add_space_icon_background"
app:tint="?attr/vctr_spoiler_background_color" />
<TextView
style="@style/Widget.Vector.TextView.Body.Medium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:text="@string/add_space"
android:textSize="17sp"
app:layout_constraintBottom_toBottomOf="@id/add_space_icon_background"
app:layout_constraintStart_toEndOf="@id/add_space_icon_background"
app:layout_constraintTop_toTopOf="@id/add_space_icon_background" />
<Space
android:layout_width="match_parent"
android:layout_height="16dp"
app:layout_constraintTop_toBottomOf="@id/add_space_icon_background" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>