From 95aa50a47c260ec77d85cf0d7f62a553fd847466 Mon Sep 17 00:00:00 2001 From: LooKeR Date: Mon, 6 Dec 2021 01:21:10 +0530 Subject: [PATCH] Clean Resources --- .../looker/droidify/screen/ScreenshotsAdapter.kt | 10 ++++------ src/main/res/color/accent_dark.xml | 8 -------- src/main/res/color/accent_light.xml | 8 -------- src/main/res/color/error_dark.xml | 8 -------- src/main/res/color/error_light.xml | 8 -------- src/main/res/color/tab_text_color.xml | 6 ------ src/main/res/drawable/bg_item_rounded_ripple.xml | 10 ---------- src/main/res/drawable/bottom_corner.xml | 6 ------ src/main/res/drawable/ic_code.xml | 2 +- src/main/res/mipmap-anydpi-v26/ic_launcher.xml | 2 +- .../res/mipmap-anydpi-v26/ic_launcher_round.xml | 2 +- src/main/res/values/colors.xml | 15 --------------- src/main/res/values/styles.xml | 6 +++--- 13 files changed, 10 insertions(+), 81 deletions(-) delete mode 100644 src/main/res/color/accent_dark.xml delete mode 100644 src/main/res/color/accent_light.xml delete mode 100644 src/main/res/color/error_dark.xml delete mode 100644 src/main/res/color/error_light.xml delete mode 100644 src/main/res/color/tab_text_color.xml delete mode 100644 src/main/res/drawable/bg_item_rounded_ripple.xml delete mode 100644 src/main/res/drawable/bottom_corner.xml diff --git a/src/main/kotlin/com/looker/droidify/screen/ScreenshotsAdapter.kt b/src/main/kotlin/com/looker/droidify/screen/ScreenshotsAdapter.kt index cf351591..621b2805 100644 --- a/src/main/kotlin/com/looker/droidify/screen/ScreenshotsAdapter.kt +++ b/src/main/kotlin/com/looker/droidify/screen/ScreenshotsAdapter.kt @@ -3,10 +3,9 @@ package com.looker.droidify.screen import android.content.Context import android.graphics.drawable.Drawable import android.view.ViewGroup -import androidx.appcompat.content.res.AppCompatResources import androidx.recyclerview.widget.RecyclerView import coil.load -import com.google.android.material.circularreveal.CircularRevealFrameLayout +import com.google.android.material.card.MaterialCardView import com.google.android.material.imageview.ShapeableImageView import com.looker.droidify.R import com.looker.droidify.entity.Product @@ -25,14 +24,12 @@ class ScreenshotsAdapter(private val onClick: (Product.Screenshot) -> Unit) : private val items = mutableListOf() private class ViewHolder(context: Context) : - RecyclerView.ViewHolder(CircularRevealFrameLayout(context)) { + RecyclerView.ViewHolder(MaterialCardView(context)) { val image: ShapeableImageView val placeholder: Drawable init { - itemView as CircularRevealFrameLayout - itemView.foreground = - AppCompatResources.getDrawable(itemView.context, R.drawable.bg_item_rounded_ripple) + itemView as MaterialCardView val surfaceColor = itemView.context.getColorFromAttr(R.attr.colorSurface).defaultColor @@ -48,6 +45,7 @@ class ScreenshotsAdapter(private val onClick: (Product.Screenshot) -> Unit) : .setAllCornerSizes(radius) .build() image.shapeAppearanceModel = shapeAppearanceModel + itemView.shapeAppearanceModel = shapeAppearanceModel itemView.addView(image) itemView.layoutParams = RecyclerView.LayoutParams( RecyclerView.LayoutParams.WRAP_CONTENT, diff --git a/src/main/res/color/accent_dark.xml b/src/main/res/color/accent_dark.xml deleted file mode 100644 index 5b933177..00000000 --- a/src/main/res/color/accent_dark.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/src/main/res/color/accent_light.xml b/src/main/res/color/accent_light.xml deleted file mode 100644 index 5f96aa9c..00000000 --- a/src/main/res/color/accent_light.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/src/main/res/color/error_dark.xml b/src/main/res/color/error_dark.xml deleted file mode 100644 index 501eeb3f..00000000 --- a/src/main/res/color/error_dark.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/src/main/res/color/error_light.xml b/src/main/res/color/error_light.xml deleted file mode 100644 index 8d27c365..00000000 --- a/src/main/res/color/error_light.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/src/main/res/color/tab_text_color.xml b/src/main/res/color/tab_text_color.xml deleted file mode 100644 index df033810..00000000 --- a/src/main/res/color/tab_text_color.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/main/res/drawable/bg_item_rounded_ripple.xml b/src/main/res/drawable/bg_item_rounded_ripple.xml deleted file mode 100644 index 5875c780..00000000 --- a/src/main/res/drawable/bg_item_rounded_ripple.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/main/res/drawable/bottom_corner.xml b/src/main/res/drawable/bottom_corner.xml deleted file mode 100644 index fd8f9d23..00000000 --- a/src/main/res/drawable/bottom_corner.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/main/res/drawable/ic_code.xml b/src/main/res/drawable/ic_code.xml index e0f22ee9..d7216081 100644 --- a/src/main/res/drawable/ic_code.xml +++ b/src/main/res/drawable/ic_code.xml @@ -5,6 +5,6 @@ android:viewportWidth="24" android:viewportHeight="24"> \ No newline at end of file diff --git a/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 4196973a..6bbe1831 100644 --- a/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 4196973a..6bbe1831 100644 --- a/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml index a929b5e1..e096e9ff 100644 --- a/src/main/res/values/colors.xml +++ b/src/main/res/values/colors.xml @@ -1,21 +1,6 @@ - #E8F5E9 - #D3FAD6 - #A3EBB7 - #6EC898 - #51DF93 - #1B5E20 - - #EF9A9A - #EF8A8A - #000000 - #1E1E1E - - #FFFFFF - #DDDDDD - #505050 #2C2C2C #006D3E diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml index 83ebb715..e48b5f83 100644 --- a/src/main/res/values/styles.xml +++ b/src/main/res/values/styles.xml @@ -28,7 +28,7 @@ @color/md_theme_light_inverseOnSurface @color/md_theme_light_inverseSurface @color/md_theme_light_primaryInverse - @color/green50 + @color/md_theme_light_surface @android:color/transparent true @@ -106,8 +106,8 @@ @color/md_theme_dark_inverseSurface @color/md_theme_dark_primaryInverse @color/pitch_black - @color/green50 - @color/black + @color/md_theme_dark_onBackground + @color/md_theme_dark_surface @android:color/transparent @drawable/scrollbar_thumb