Merge pull request material-components#62 from ricknout/develop

Add ShapeableImageView to component list

Author: ricknout

MaterialThemeBuilder/app/src/main/java/io/material/materialthemebuilder/ui/component/Component.kt

@@ -38,5 +38,6 @@ enum class Component {
   TABS,
   SNACKBAR,
   DIALOG,
-  BOTTOM_SHEET
+  BOTTOM_SHEET,
+  IMAGE
 }

MaterialThemeBuilder/app/src/main/java/io/material/materialthemebuilder/ui/component/ComponentViewHolder.kt

@@ -48,6 +48,7 @@ import io.material.materialthemebuilder.ui.component.Component.TABS
 import io.material.materialthemebuilder.ui.component.Component.SNACKBAR
 import io.material.materialthemebuilder.ui.component.Component.DIALOG
 import io.material.materialthemebuilder.ui.component.Component.BOTTOM_SHEET
+import io.material.materialthemebuilder.ui.component.Component.IMAGE
 
 /**
  * Sealed class to define all [RecyclerView.ViewHolder]s used to display [Component]s.
@@ -179,6 +180,10 @@ sealed class ComponentViewHolder(val view: View) : RecyclerView.ViewHolder(view)
     }
   }
 
+  class ImageComponentViewHolder(
+    parent: ViewGroup
+  ) : ComponentViewHolder(inflate(parent, R.layout.component_image))
+
   companion object {
     fun create(
       parent: ViewGroup,
@@ -202,6 +207,7 @@ sealed class ComponentViewHolder(val view: View) : RecyclerView.ViewHolder(view)
         SNACKBAR -> SnackbarComponentViewHolder(parent)
         DIALOG -> DialogComponentViewHolder(parent)
         BOTTOM_SHEET -> BottomSheetComponentViewHolder(parent, listener)
+        IMAGE -> ImageComponentViewHolder(parent)
       }
     }
 

MaterialThemeBuilder/app/src/main/res/layout/component_image.xml

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+~ Copyright (C) 2019 The Android Open Source Project
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~      http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:clipToPadding="false"
+    android:paddingTop="@dimen/keyline_5"
+    android:paddingBottom="@dimen/keyline_5"
+    android:paddingStart="@dimen/keyline_4"
+    android:paddingEnd="@dimen/keyline_4">
+
+    <io.material.materialthemebuilder.widget.LabelLinkView
+        android:id="@+id/label"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/image_label_title"
+        app:linkUrl="https://github.com/material-components/material-components-android/blob/master/lib/java/com/google/android/material/imageview/ShapeableImageView.java"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <com.google.android.material.imageview.ShapeableImageView
+        android:layout_width="match_parent"
+        android:layout_height="192dp"
+        android:scaleType="centerCrop"
+        app:srcCompat="@drawable/sample_image"
+        app:shapeAppearance="?attr/shapeAppearanceMediumComponent"
+        app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.MyTheme.Image"
+        app:strokeColor="?attr/colorPrimary"
+        app:strokeWidth="2dp"
+        android:layout_marginTop="@dimen/component_label_horizontal_margin"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/label"
+        tools:ignore="ContentDescription" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

MaterialThemeBuilder/app/src/main/res/values/shape.xml

@@ -48,4 +48,10 @@
         <!--Your custom shape here-->
     </style>
 
+    <!--Shape Appearance overlay for ShapeableImageView -->
+    <style name="ShapeAppearanceOverlay.MyTheme.Image" parent="">
+        <item name="cornerSize">0dp</item>
+        <item name="cornerSizeTopLeft">50%</item>
+    </style>
+
 </resources>

MaterialThemeBuilder/app/src/main/res/values/strings.xml

@@ -16,7 +16,7 @@
 
 <resources>
     <string name="app_name">Build a Material Theme</string>
-    <string name="theme_name_hint">Theme name...</string>
+    <string name="theme_name_hint">Theme name…</string>
 
     <string name="lorem_ipsum">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</string>
 
@@ -88,6 +88,7 @@
     <string name="bottom_sheet_label_title">Bottom sheet</string>
     <string name="bottom_sheet_button_label">Show bottom sheet</string>
 
+    <string name="image_label_title">Image</string>
 
     <!--Theme Summary-->
     <string name="label_color_scheme_title">Color scheme</string>