Skip to content

Commit 734670d

Browse files
afohrmandsn5ft
authored andcommitted
Add full color palette for themes in shape theming demos.
- The color palettes are now more or less legible (no more white on white text fields) - Change placeholder text in chip to be more visually descriptive PiperOrigin-RevId: 224973952
1 parent 55cfdb0 commit 734670d

File tree

5 files changed

+27
-8
lines changed

5 files changed

+27
-8
lines changed

catalog/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ def srcDirs = [
3434
'main',
3535
'menu',
3636
'radiobutton',
37+
'shapetheming',
3738
'switchmaterial',
3839
'tableofcontents',
3940
'tabs',

catalog/java/io/material/catalog/shapetheming/ShapeThemingFragment.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818

1919
import io.material.catalog.R;
2020

21-
import static io.material.catalog.feature.FeatureDemo.STATUS_WIP;
22-
2321
import android.support.v4.app.Fragment;
2422
import dagger.Provides;
2523
import dagger.android.ContributesAndroidInjector;
@@ -94,7 +92,7 @@ public abstract static class Module {
9492
@Provides
9593
@ActivityScope
9694
static FeatureDemo provideFeatureDemo() {
97-
return new FeatureDemo(R.string.cat_shape_theming_title, R.drawable.ic_shape, STATUS_WIP) {
95+
return new FeatureDemo(R.string.cat_shape_theming_title, R.drawable.ic_shape) {
9896
@Override
9997
public Fragment createFragment() {
10098
return new ShapeThemingFragment();

catalog/java/io/material/catalog/shapetheming/res/values/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<string name="cat_shape_theming_shrine_demo_title">Shrine Demo</string>
3131
<string name="cat_shape_theming_placeholder">Shape theming demo coming soon...</string>
3232

33-
<string name="cat_shape_theming_chip_text">Hello, World!</string>
33+
<string name="cat_shape_theming_chip_text">Shaped Chip</string>
3434
<string name="cat_shape_theming_card_text">This is a shaped card.</string>
3535

3636

catalog/java/io/material/catalog/shapetheming/res/values/styles.xml

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,17 @@
7777

7878
<!-- Fortnightly -->
7979
<style name="ThemeOverlay.Fortnightly" parent="">
80-
<item name="colorPrimary">#ffffff</item>
81-
<item name="colorSecondary">#6b3f8b</item>
80+
<item name="colorPrimary">#000000</item>
81+
<item name="colorPrimaryVariant">#4E0D3A</item>
82+
<item name="colorSecondary">#6B38FB</item>
83+
<item name="colorSurface">#FFFFFF</item>
84+
<item name="android:colorBackground">#FFFFFF</item>
85+
<item name="colorError">#C5032B</item>
86+
<item name="colorOnPrimary">#292929</item>
87+
<item name="colorOnSecondary">#FFFFFF</item>
88+
<item name="colorOnSurface">#442B2D</item>
89+
<item name="colorOnError">#FFFBFA</item>
90+
<item name="colorOnBackground">#442B2D</item>
8291

8392
<item name="shapeAppearanceSmallComponent">@style/ShapeAppearance.Fortnightly.SmallComponent</item>
8493
<item name="shapeAppearanceMediumComponent">@style/ShapeAppearance.Fortnightly.MediumComponent</item>
@@ -125,8 +134,17 @@
125134
<!-- Crane -->
126135

127136
<style name="ThemeOverlay.Crane" parent="">
128-
<item name="colorPrimary">#5d1049</item>
129-
<item name="colorSecondary">#e30425</item>
137+
<item name="colorPrimary">#5D1049</item>
138+
<item name="colorPrimaryVariant">#4E0D3A</item>
139+
<item name="colorSecondary">#E30425</item>
140+
<item name="colorSurface">#FFFBFA</item>
141+
<item name="android:colorBackground">#FFFFFF</item>
142+
<item name="colorError">#EF9A43</item>
143+
<item name="colorOnPrimary">#442B2D</item>
144+
<item name="colorOnSecondary">#FFFFFF</item>
145+
<item name="colorOnSurface">#442B2D</item>
146+
<item name="colorOnError">#FFFBFA</item>
147+
<item name="colorOnBackground">#442B2D</item>
130148

131149
<item name="shapeAppearanceSmallComponent">@style/ShapeAppearance.Crane.SmallComponent</item>
132150
<item name="shapeAppearanceMediumComponent">@style/ShapeAppearance.Crane.MediumComponent</item>

catalog/java/io/material/catalog/tableofcontents/TocModule.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import io.material.catalog.font.FontFragment;
3131
import io.material.catalog.menu.MenuFragment;
3232
import io.material.catalog.radiobutton.RadioButtonFragment;
33+
import io.material.catalog.shapetheming.ShapeThemingFragment;
3334
import io.material.catalog.switchmaterial.SwitchFragment;
3435
import io.material.catalog.tabs.TabsFragment;
3536
import io.material.catalog.textfield.TextFieldFragment;
@@ -55,6 +56,7 @@
5556
FontFragment.Module.class,
5657
MenuFragment.Module.class,
5758
RadioButtonFragment.Module.class,
59+
ShapeThemingFragment.Module.class,
5860
SwitchFragment.Module.class,
5961
TabsFragment.Module.class,
6062
TextFieldFragment.Module.class,

0 commit comments

Comments
 (0)