Переглянути джерело

Fixed avatar placeholder background color

Vadik Sirekanyan 7 роки тому
батько
коміт
5092040767

+ 8 - 2
app/src/main/java/me/vadik/knigopis/common/extensions/image_view.kt

@@ -6,12 +6,18 @@ import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
 import com.bumptech.glide.request.RequestOptions
 import me.vadik.knigopis.R
 
-fun ImageView.setCircleImage(url: String?) {
+fun ImageView.setCircleImage(url: String?, isDark: Boolean = false) {
     Glide.with(context)
         .load(url)
         .apply(
             RequestOptions.circleCropTransform()
-                .placeholder(R.drawable.oval_placeholder_background)
+                .placeholder(
+                    if (isDark) {
+                        R.drawable.oval_dark_placeholder_background
+                    } else {
+                        R.drawable.oval_placeholder_background
+                    }
+                )
                 .theme(context.theme)
         )
         .transition(DrawableTransitionOptions.withCrossFade())

+ 1 - 1
app/src/main/java/me/vadik/knigopis/feature/user/UserActivity.kt

@@ -50,7 +50,7 @@ class UserActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.user_activity)
         toolbar.title = intent.getStringExtra(EXTRA_USER_NAME)
-        toolbarImage.setCircleImage(intent.getStringExtra(EXTRA_USER_PHOTO))
+        toolbarImage.setCircleImage(intent.getStringExtra(EXTRA_USER_PHOTO), isDark = true)
         toolbarImage.setElevationRes(R.dimen.image_view_elevation)
         setSupportActionBar(toolbar)
         fab.setOnClickListener { view ->

+ 5 - 0
app/src/main/res/drawable/oval_dark_placeholder_background.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="?attr/image_dark_placeholder_color" />
+</shape>

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

@@ -43,8 +43,7 @@
         android:layout_marginLeft="16dp"
         android:layout_marginRight="16dp"
         android:layout_marginTop="56dp"
-        android:src="@drawable/oval_placeholder_background"
-        android:theme="@style/ProfileAppTheme"
+        android:src="@drawable/oval_dark_placeholder_background"
         app:appBarLayout="@+id/app_bar"
         app:appBarMaxHeight="@dimen/app_bar_height"
         app:appBarMinHeight="@dimen/toolbar_height"

+ 1 - 0
app/src/main/res/values/attrs.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <attr name="image_placeholder_color" format="reference|color" />
+    <attr name="image_dark_placeholder_color" format="reference|color" />
     <attr name="book_progress_drawable" format="reference" />
     <declare-styleable name="ViewBehavior">
         <attr name="appBarLayout" format="reference" />

+ 2 - 0
app/src/main/res/values/colors.xml

@@ -43,6 +43,7 @@
     <color name="light.text_color_secondary">@color/black_60</color>
     <color name="light.text_color_tertiary">@color/black_38</color>
     <color name="light_image_placeholder_color">@color/common_deep_purple_50</color>
+    <color name="light_image_dark_placeholder_color">@color/common_deep_purple_300</color>
     <color name="light_book_progress_color">@color/common_deep_purple_200</color>
 
     <!-- dark theme -->
@@ -54,6 +55,7 @@
     <color name="dark.text_color_secondary">@color/white_60</color>
     <color name="dark.text_color_tertiary">@color/white_38</color>
     <color name="dark_image_placeholder_color">@color/common_blue_gray_700</color>
+    <color name="dark_image_dark_placeholder_color">@color/common_blue_gray_300</color>
     <color name="dark_book_progress_color">@color/common_blue_gray_700</color>
 
     <!-- profile theme -->

+ 2 - 0
app/src/main/res/values/styles.xml

@@ -17,6 +17,7 @@
         <item name="android:windowBackground">@color/light.background_color</item>
         <item name="android:listDivider">@drawable/recycler_view_divider</item>
         <item name="image_placeholder_color">@color/light_image_placeholder_color</item>
+        <item name="image_dark_placeholder_color">@color/light_image_dark_placeholder_color</item>
         <item name="book_progress_drawable">@drawable/progress_bar_background_light</item>
         <item name="android:textColorPrimary">@color/light.text_color_primary</item>
         <item name="android:textColorSecondary">@color/light.text_color_secondary</item>
@@ -30,6 +31,7 @@
         <item name="android:windowBackground">@color/dark.background_color</item>
         <item name="android:listDivider">@drawable/recycler_view_divider</item>
         <item name="image_placeholder_color">@color/dark_image_placeholder_color</item>
+        <item name="image_dark_placeholder_color">@color/dark_image_dark_placeholder_color</item>
         <item name="book_progress_drawable">@drawable/progress_bar_background_dark</item>
         <item name="android:textColorPrimary">@color/dark.text_color_primary</item>
         <item name="android:textColorSecondary">@color/dark.text_color_secondary</item>