Skip to content

Commit 49361e4

Browse files
kazievabkazievab
committed
Reduce the size of icons from ~25 MB to ~200 KB
1 parent 3814b4a commit 49361e4

File tree

90 files changed

+500
-410
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+500
-410
lines changed

‎build.sbt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@ lazy val commonSettings = Seq(
110110
version in startWebpackDevServer := Settings.versions.bundler.webpackDev,
111111
webpackCliVersion := Settings.versions.bundler.webpackCli,
112112
javacOptions ++= Settings.javacOptions,
113-
scalacOptions ++= Settings.scalacOptions,
114113
scalacOptions ~= (_.filterNot(
115114
Set(
116115
"-Wdead-code",

‎demo/lib/scalajs-react-material-ui-icons_sjs1_2.13-0.1.0+1-5e41edb4+20201105-1130-SNAPSHOT.jar‎

225 KB
Binary file not shown.

‎demo/lib/scalajs-react-material-ui-icons_sjs1_2.13-0.1.0.jar‎

-25.9 MB
Binary file not shown.

‎demo/src/main/scala/io/kinoplan/demo/components/Layout.scala‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import io.kinoplan.demo.utils.Helpers._
77
import io.kinoplan.demo.utils.icons.{MuiLightBulbFullIcon, MuiLightBulbOutlineIcon}
88
import io.kinoplan.scalajs.react.material.ui.core._
99
import io.kinoplan.scalajs.react.material.ui.core.styles._
10-
import io.kinoplan.scalajs.react.material.ui.icons.{MuiChevronLeftIcon, MuiMenuIcon, MuiNotificationsIcon}
10+
import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule}
1111
import japgolly.scalajs.react._
1212
import japgolly.scalajs.react.extra.router.{Resolution, RouterCtl}
1313
import japgolly.scalajs.react.vdom.Attr
@@ -86,7 +86,7 @@ object Layout extends ScalaCssReactImplicits {
8686
MuiIconButton(color = MuiIconButton.Color.inherit)(css.menuButton, menuButtonHidden,
8787
aria.label := "Open drawer",
8888
onClick --> handleDrawerOpen,
89-
MuiMenuIcon()
89+
MuiIcons(MuiIconsModule.Menu)()
9090
),
9191
MuiTypography(
9292
component = "h1",
@@ -107,7 +107,7 @@ object Layout extends ScalaCssReactImplicits {
107107
),
108108
MuiIconButton(color = MuiIconButton.Color.inherit)(
109109
MuiBadge(badgeContent = VdomNode(4), color = MuiBadge.Color.secondary)(
110-
MuiNotificationsIcon()
110+
MuiIcons(MuiIconsModule.Notifications)()
111111
)
112112
)
113113
)
@@ -117,7 +117,7 @@ object Layout extends ScalaCssReactImplicits {
117117
if (!state.open) css.drawerPaperClose else css.common.emptyStyle,
118118
div(css.toolbar,
119119
MuiIconButton()(onClick --> handleDrawerClose,
120-
MuiChevronLeftIcon()
120+
MuiIcons(MuiIconsModule.ChevronLeft)()
121121
)
122122
),
123123
MainMenu(props.router, props.r)

‎demo/src/main/scala/io/kinoplan/demo/components/demos/AppBar/BottomAppBar.scala‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import io.kinoplan.demo.components.{ComponentContainer, Layout}
44
import io.kinoplan.demo.models.Message
55
import io.kinoplan.demo.styles.demos.AppBar.{BottomAppBarStyle, DefaultBottomAppBarStyle}
66
import io.kinoplan.scalajs.react.material.ui.core._
7-
import io.kinoplan.scalajs.react.material.ui.icons.{MuiMenuIcon, MuiMoreVertIcon, MuiSearchIcon}
7+
import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule}
88
import japgolly.scalajs.react.vdom.all.{VdomElement, _}
99
import japgolly.scalajs.react.{BackendScope, React, ScalaComponent}
1010
import scalacss.ScalaCssReactImplicits
@@ -42,14 +42,14 @@ object BottomAppBar extends ScalaCssReactImplicits {
4242
MuiToolbar()(css.toolbar,
4343
MuiIconButton(color = MuiIconButton.Color.inherit)(
4444
aria.label := "Open drawer",
45-
MuiMenuIcon()
45+
MuiIcons(MuiIconsModule.Menu)()
4646
),
4747
div(
4848
MuiIconButton(color = MuiIconButton.Color.inherit)(
49-
MuiSearchIcon()
49+
MuiIcons(MuiIconsModule.Search)()
5050
),
5151
MuiIconButton(color = MuiIconButton.Color.inherit)(
52-
MuiMoreVertIcon()
52+
MuiIcons(MuiIconsModule.MoreVert)()
5353
)
5454
)
5555
)

‎demo/src/main/scala/io/kinoplan/demo/components/demos/AppBar/ButtonAppBar.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package io.kinoplan.demo.components.demos.AppBar
33
import io.kinoplan.demo.components.ComponentContainer
44
import io.kinoplan.demo.styles.{CommonStyle, DefaultCommonStyle}
55
import io.kinoplan.scalajs.react.material.ui.core._
6-
import io.kinoplan.scalajs.react.material.ui.icons.MuiMenuIcon
6+
import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule}
77
import japgolly.scalajs.react.vdom.all.{VdomElement, _}
88
import japgolly.scalajs.react.{BackendScope, ScalaComponent}
99
import scalacss.ScalaCssReactImplicits
@@ -21,7 +21,7 @@ object ButtonAppBar extends ScalaCssReactImplicits {
2121
MuiAppBar(position = MuiAppBar.Position.static)(
2222
MuiToolbar()(
2323
MuiIconButton(color = MuiIconButton.Color.inherit)(css.menuButton, aria.label := "Menu",
24-
MuiMenuIcon()
24+
MuiIcons(MuiIconsModule.Menu)()
2525
),
2626
MuiTypography(variant = MuiTypography.Variant.h6, color = MuiTypography.Color.inherit)(css.title,
2727
"News"

‎demo/src/main/scala/io/kinoplan/demo/components/demos/AppBar/DenseAppBar.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package io.kinoplan.demo.components.demos.AppBar
33
import io.kinoplan.demo.components.ComponentContainer
44
import io.kinoplan.demo.styles.{CommonStyle, DefaultCommonStyle}
55
import io.kinoplan.scalajs.react.material.ui.core.{MuiAppBar, MuiIconButton, MuiToolbar, MuiTypography}
6-
import io.kinoplan.scalajs.react.material.ui.icons.MuiMenuIcon
6+
import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule}
77
import japgolly.scalajs.react.vdom.all.{VdomElement, _}
88
import japgolly.scalajs.react.{BackendScope, ScalaComponent}
99
import scalacss.ScalaCssReactImplicits
@@ -22,7 +22,7 @@ object DenseAppBar extends ScalaCssReactImplicits {
2222
MuiToolbar(variant = MuiToolbar.Variant.dense)(
2323
MuiIconButton(color = MuiIconButton.Color.inherit)(css.menuButtonDesktop,
2424
aria.label := "Menu",
25-
MuiMenuIcon()
25+
MuiIcons(MuiIconsModule.Menu)()
2626
),
2727
MuiTypography(variant = MuiTypography.Variant.h6, color = MuiTypography.Color.inherit)(
2828
"Photos"

‎demo/src/main/scala/io/kinoplan/demo/components/demos/AppBar/MenuAppBar.scala‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@ import io.kinoplan.demo.components.ComponentContainer
44
import io.kinoplan.demo.styles.{CommonStyle, DefaultCommonStyle}
55
import io.kinoplan.scalajs.react.material.ui.core.internal.Origin
66
import io.kinoplan.scalajs.react.material.ui.core._
7-
import io.kinoplan.scalajs.react.material.ui.icons.{MuiAccountCircleIcon, MuiMenuIcon}
7+
import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule}
88
import japgolly.scalajs.react.vdom.Attr
99
import japgolly.scalajs.react.vdom.all.{VdomElement, _}
1010
import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ReactEventFromHtml, ReactEventFromInput, ScalaComponent}
1111
import org.scalajs.dom.raw.HTMLElement
1212
import scalacss.ScalaCssReactImplicits
13-
1413
import scala.scalajs.js.JSConverters._
1514

1615
object MenuAppBar extends ScalaCssReactImplicits {
@@ -87,7 +86,7 @@ object MenuAppBar extends ScalaCssReactImplicits {
8786
MuiToolbar()(
8887
MuiIconButton(color = MuiIconButton.Color.inherit)(css.menuButton,
8988
aria.label := "Menu",
90-
MuiMenuIcon()
89+
MuiIcons(MuiIconsModule.Menu)()
9190
),
9291
MuiTypography(variant = MuiTypography.Variant.h6, color = MuiTypography.Color.inherit)(css.flexGrowOne,
9392
"Photos"
@@ -98,7 +97,7 @@ object MenuAppBar extends ScalaCssReactImplicits {
9897
aria.haspopup.`true`,
9998
Attr("edge") := "end",
10099
onClick ==> handleProfileMenuOpen,
101-
MuiAccountCircleIcon()
100+
MuiIcons(MuiIconsModule.AccountCircle)()
102101
),
103102
renderMenu().when(open)
104103
).when(state.auth)

‎demo/src/main/scala/io/kinoplan/demo/components/demos/AppBar/PrimarySearchAppBar.scala‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
package io.kinoplan.demo.components.demos.AppBar
22

3+
import cats.syntax.option._
34
import io.kinoplan.demo.components.ComponentContainer
45
import io.kinoplan.demo.styles.demos.AppBar.{DefaultPrimarySearchAppBarStyle, PrimarySearchAppBarStyle}
56
import io.kinoplan.demo.utils.Helpers._
67
import io.kinoplan.scalajs.react.material.ui.core.internal.Origin
78
import io.kinoplan.scalajs.react.material.ui.core._
8-
import io.kinoplan.scalajs.react.material.ui.icons._
99
import japgolly.scalajs.react.vdom.Attr
1010
import japgolly.scalajs.react.vdom.all.{VdomElement, _}
1111
import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ReactEventFromHtml, ScalaComponent}
1212
import org.scalajs.dom.raw.HTMLElement
1313
import scalacss.ScalaCssReactImplicits
14-
1514
import scala.scalajs.js.JSConverters._
1615

16+
import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule}
17+
1718
object PrimarySearchAppBar extends ScalaCssReactImplicits {
1819
case class Props(style: PrimarySearchAppBarStyle)
1920

@@ -60,7 +61,7 @@ object PrimarySearchAppBar extends ScalaCssReactImplicits {
6061
val inputBaseClasses = Map(
6162
MuiInputBase.ClassKey.input -> styleAToClassName(css.inputInput),
6263
MuiInputBase.ClassKey.root -> styleAToClassName(css.inputRoot)
63-
)
64+
).some.orUndefined
6465

6566
val ariaOwns = if (isMenuOpen) "material-appbar" else ""
6667

@@ -92,22 +93,22 @@ object PrimarySearchAppBar extends ScalaCssReactImplicits {
9293
MuiMenuItem()(
9394
MuiIconButton(color = MuiIconButton.Color.inherit)(
9495
MuiBadge(badgeContent = VdomNode(4), color = MuiBadge.Color.secondary)(
95-
MuiMailIcon()
96+
MuiIcons(MuiIconsModule.Mail)()
9697
)
9798
),
9899
p("Messages")
99100
),
100101
MuiMenuItem()(
101102
MuiIconButton(color = MuiIconButton.Color.inherit)(
102103
MuiBadge(badgeContent = VdomNode(11), color = MuiBadge.Color.secondary)(
103-
MuiNotificationsIcon()
104+
MuiIcons(MuiIconsModule.Notifications)()
104105
)
105106
),
106107
p("Notifications")
107108
),
108109
MuiMenuItem()(onClick ==> handleProfileMenuOpen,
109110
MuiIconButton(color = MuiIconButton.Color.inherit)(
110-
MuiAccountCircleIcon()
111+
MuiIcons(MuiIconsModule.AccountCircle)()
111112
),
112113
p("Profile")
113114
)
@@ -122,40 +123,40 @@ object PrimarySearchAppBar extends ScalaCssReactImplicits {
122123
MuiIconButton(color = MuiIconButton.Color.inherit)(css.common.menuButton,
123124
aria.label := "Open drawer",
124125
Attr("edge") := "start",
125-
MuiMenuIcon()
126+
MuiIcons(MuiIconsModule.Menu)()
126127
),
127128
MuiTypography(variant = MuiTypography.Variant.h6, color = MuiTypography.Color.inherit, noWrap = true)(css.title,
128129
"Material-UI"
129130
),
130131
div(css.search,
131-
div(css.searchIcon, MuiSearchIcon()),
132+
div(css.searchIcon, MuiIcons(MuiIconsModule.Search)()),
132133
MuiInputBase(classes = inputBaseClasses)(placeholder := "Search…")
133134
),
134135
div(css.common.flexGrowOne),
135136
div(css.sectionDesktop,
136137
MuiIconButton(color = MuiIconButton.Color.inherit)(
137138
MuiBadge(badgeContent = VdomNode(4), color = MuiBadge.Color.secondary)(
138-
MuiMailIcon()
139+
MuiIcons(MuiIconsModule.Mail)()
139140
)
140141
),
141142
MuiIconButton(color = MuiIconButton.Color.inherit)(
142143
MuiBadge(badgeContent = VdomNode(17), color = MuiBadge.Color.secondary)(
143-
MuiNotificationsIcon()
144+
MuiIcons(MuiIconsModule.Notifications)()
144145
)
145146
),
146147
MuiIconButton(color = MuiIconButton.Color.inherit)(
147148
aria.owns := ariaOwns,
148149
aria.haspopup.`true`,
149150
Attr("edge") := "end",
150151
onClick ==> handleProfileMenuOpen,
151-
MuiAccountCircleIcon()
152+
MuiIcons(MuiIconsModule.AccountCircle)()
152153
)
153154
),
154155
div(css.sectionMobile,
155156
MuiIconButton(color = MuiIconButton.Color.inherit)(
156157
aria.haspopup.`true`,
157158
onClick ==> handleMobileMenuOpen,
158-
MuiMoreVertIcon()
159+
MuiIcons(MuiIconsModule.MoreVert)()
159160
)
160161
)
161162
)

‎demo/src/main/scala/io/kinoplan/demo/components/demos/AppBar/SearchAppBar.scala‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
package io.kinoplan.demo.components.demos.AppBar
22

3+
import cats.syntax.option._
34
import io.kinoplan.demo.components.ComponentContainer
45
import io.kinoplan.demo.styles.demos.AppBar.{DefaultSearchAppBarStyle, SearchAppBarStyle}
56
import io.kinoplan.demo.utils.Helpers._
67
import io.kinoplan.scalajs.react.material.ui.core._
7-
import io.kinoplan.scalajs.react.material.ui.icons.{MuiMenuIcon, MuiSearchIcon}
8+
import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule}
89
import japgolly.scalajs.react.vdom.all.{VdomElement, _}
910
import japgolly.scalajs.react.{BackendScope, ScalaComponent}
1011
import scalacss.ScalaCssReactImplicits
12+
import scala.scalajs.js.JSConverters._
1113

1214
object SearchAppBar extends ScalaCssReactImplicits {
1315
case class Props(style: SearchAppBarStyle)
@@ -19,7 +21,7 @@ object SearchAppBar extends ScalaCssReactImplicits {
1921
val inputBaseClasses = Map(
2022
MuiInputBase.ClassKey.input -> styleAToClassName(css.inputInput),
2123
MuiInputBase.ClassKey.root -> styleAToClassName(css.inputRoot)
22-
)
24+
).some.orUndefined
2325

2426
div(
2527
ComponentContainer("App Bar with search field")(
@@ -28,14 +30,14 @@ object SearchAppBar extends ScalaCssReactImplicits {
2830
MuiToolbar()(
2931
MuiIconButton(color = MuiIconButton.Color.inherit)(css.common.menuButton,
3032
aria.label := "Open drawer",
31-
MuiMenuIcon()
33+
MuiIcons(MuiIconsModule.Menu)()
3234
),
3335
MuiTypography(variant = MuiTypography.Variant.h6, color = MuiTypography.Color.inherit, noWrap = true)(css.title,
3436
"Material-UI"
3537
),
3638
div(css.common.flexGrowOne),
3739
div(css.search,
38-
div(css.searchIcon, MuiSearchIcon()),
40+
div(css.searchIcon, MuiIcons(MuiIconsModule.Search)()),
3941
MuiInputBase(classes = inputBaseClasses)(placeholder := "Search…")
4042
)
4143
)

0 commit comments

Comments
 (0)