Forráskód Böngészése

Fixed image view elevation on user screen

Vadik Sirekanyan 5 éve
szülő
commit
c1f16e880c

+ 0 - 6
app/src/main/java/com/sirekanyan/knigopis/common/extensions/View.kt

@@ -1,8 +1,6 @@
 package com.sirekanyan.knigopis.common.extensions
 
 import android.view.View
-import androidx.annotation.DimenRes
-import androidx.core.view.ViewCompat
 import androidx.interpolator.view.animation.FastOutLinearInInterpolator
 import androidx.interpolator.view.animation.LinearOutSlowInInterpolator
 
@@ -34,10 +32,6 @@ fun View.hide() {
         .withEndAction { visibility = View.GONE }
 }
 
-fun View.setElevationRes(@DimenRes elevation: Int) {
-    ViewCompat.setElevation(this, resources.getDimensionPixelSize(elevation).toFloat())
-}
-
 fun View.startExpandAnimation() {
     alpha = 0f
     scaleX = 0f

+ 0 - 1
app/src/main/java/com/sirekanyan/knigopis/feature/user/UserView.kt

@@ -68,7 +68,6 @@ class UserViewImpl(
 
     override fun setImage(url: String?) {
         userImage.setCircleImageOnPrimary(url)
-        userImage.setElevationRes(R.dimen.image_view_elevation)
     }
 
     override fun setBooks(books: List<BookModel>) {

+ 3 - 1
app/src/main/res/layout/user_activity.xml

@@ -9,7 +9,8 @@
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/app_bar"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/app_bar_height">
+        android:layout_height="@dimen/app_bar_height"
+        android:elevation="@dimen/app_bar_elevation">
 
         <com.google.android.material.appbar.CollapsingToolbarLayout
             android:id="@+id/toolbar_layout"
@@ -43,6 +44,7 @@
         android:layout_marginLeft="16dp"
         android:layout_marginTop="56dp"
         android:layout_marginRight="16dp"
+        android:elevation="@dimen/app_bar_elevation"
         app:appBarLayout="@+id/app_bar"
         app:appBarMaxHeight="@dimen/app_bar_height"
         app:appBarMinHeight="@dimen/toolbar_height"

+ 1 - 1
app/src/main/res/values/dimens.xml

@@ -12,11 +12,11 @@
     <dimen name="avatar_size_expanded">88dp</dimen>
     <dimen name="toolbar_height">56dp</dimen>
     <dimen name="app_bar_height">160dp</dimen>
+    <dimen name="app_bar_elevation">4dp</dimen>
     <dimen name="swipe_refresh_start_offset">36dp</dimen>
     <dimen name="swipe_refresh_end_offset">80dp</dimen>
     <dimen name="bottom_navigation_height">56dp</dimen>
     <dimen name="title_start_margin_expanded">120dp</dimen>
     <dimen name="title_start_margin_collapsed">48dp</dimen>
-    <dimen name="image_view_elevation">4dp</dimen>
 
 </resources>