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

Adds elevation to dimview and modal

Browse Source
This commit is contained in:
ericdecanini 2022-05-05 14:53:19 +02:00
parent 9fc189efce
commit 2d2f8f5479
4 changed files with 963 additions and 940 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1802
.editorconfig
View File

File diff suppressed because it is too large Load Diff

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

@ -238,7 +238,7 @@ abstract class VectorBaseActivity<VB : ViewBinding> : AppCompatActivity(), Maver
initUiAndData()
window.statusBarColor = ContextCompat.getColor(this, android.R.color.white, "somethingelse", "another thing", "awdawdwad", "awnoidwnadoinwaiodnawoindioawniodaw")
window.statusBarColor = ContextCompat.getColor(this, android.R.color.white)
window.navigationBarColor = ContextCompat.getColor(this, android.R.color.white)
val titleRes = getTitleRes()
if (titleRes != -1) {

12
vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
View File

@ -143,6 +143,18 @@ class HomeDetailFragment @Inject constructor(
updateUIForTab(currentTab)
}
views.allChatsLayout.setOnClickListener {
if (views.spaceModalFragment.isVisible) {
views.spaceModalFragment.isVisible = false
views.dimView.isVisible = false
views.toolbarChevron.rotation = 0F
} else {
views.spaceModalFragment.isVisible = true
views.dimView.isVisible = true
views.toolbarChevron.rotation = 90F
}
}
viewModel.onEach(HomeDetailViewState::showDialPadTab) { showDialPadTab ->
updateTabVisibilitySafely(R.id.bottom_action_dial_pad, showDialPadTab)
}

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

@ -24,7 +24,8 @@
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/groupToolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize">
android:layout_height="wrap_content"
android:paddingTop="24dp">
<LinearLayout
android:layout_width="match_parent"
@ -121,31 +122,34 @@
</RelativeLayout>
<TextView
android:id="@+id/groupToolbarTitleView"
style="@style/Widget.Vector.TextView.Title.Medium"
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/all_chats_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/all_chats"
android:textSize="28sp"
android:layout_marginTop="4dp"
android:layout_marginStart="4dp"
app:layout_constraintStart_toEndOf="@id/groupToolbarAvatarImageView"
app:layout_constraintTop_toTopOf="@id/groupToolbarAvatarImageView"
app:layout_constraintBottom_toBottomOf="@id/groupToolbarAvatarImageView"/>
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent">
<ImageView
android:id="@+id/toolbar_chevron"
android:layout_width="13dp"
android:layout_height="13dp"
android:src="@drawable/ic_arrow_right"
android:importantForAccessibility="no"
app:layout_constraintStart_toEndOf="@id/groupToolbarTitleView"
app:layout_constraintTop_toTopOf="@id/groupToolbarTitleView"
app:layout_constraintBottom_toBottomOf="@id/groupToolbarTitleView"
app:layout_constraintVertical_bias="0.6"
android:layout_marginStart="10dp"
app:tint="@color/palette_element_green" />
<TextView
android:id="@+id/groupToolbarTitleView"
style="@style/Widget.Vector.TextView.Title.Bold"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/all_chats"
android:textSize="26sp"
android:layout_marginStart="4dp" />
<ImageView
android:id="@+id/toolbar_chevron"
android:layout_width="13dp"
android:layout_height="13dp"
android:src="@drawable/ic_arrow_right"
android:importantForAccessibility="no"
android:layout_marginTop="4dp"
android:layout_gravity="center_vertical"
android:layout_marginStart="10dp"
app:tint="@color/palette_element_green" />
</androidx.appcompat.widget.LinearLayoutCompat>
</androidx.constraintlayout.widget.ConstraintLayout>
@ -177,24 +181,11 @@
android:id="@+id/roomListContainer"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginTop="0dp"
android:visibility="visible"
app:layout_constraintBottom_toTopOf="@id/bottomNavigationView"
app:layout_constraintTop_toBottomOf="@id/homeKeysBackupBanner" />
<View
android:layout_width="match_parent"
android:layout_height="0dp"
android:background="#000"
android:alpha="0.5"
app:layout_constraintTop_toBottomOf="@id/appBarLayout"
app:layout_constraintBottom_toBottomOf="parent" />
<androidx.fragment.app.FragmentContainerView
android:id="@+id/space_modal_fragment"
android:name="im.vector.app.features.home.SpaceListModalFragment"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/appBarLayout" />
<com.google.android.material.bottomnavigation.BottomNavigationView
android:id="@+id/bottomNavigationView"
android:layout_width="0dp"
@ -204,4 +195,24 @@
app:layout_constraintStart_toStartOf="parent"
app:menu="@menu/home_bottom_navigation" />
<View
android:id="@+id/dim_view"
android:layout_width="match_parent"
android:layout_height="0dp"
android:background="#000"
android:alpha="0.5"
android:elevation="10dp"
android:visibility="gone"
app:layout_constraintTop_toBottomOf="@id/appBarLayout"
app:layout_constraintBottom_toBottomOf="parent" />
<androidx.fragment.app.FragmentContainerView
android:id="@+id/space_modal_fragment"
android:name="im.vector.app.features.home.SpaceListModalFragment"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:elevation="15dp"
android:visibility="gone"
app:layout_constraintTop_toBottomOf="@id/appBarLayout" />
</androidx.constraintlayout.widget.ConstraintLayout>