material-nf: use more moon icons

greshake · Feb 26, 2021 · d01c73d · d01c73d
1 parent b27f977
commit d01c73d
Show file tree

Hide file tree

Showing 2 changed files with 70 additions and 19 deletions.
diff --git a/src/blocks/backlight.rs b/src/blocks/backlight.rs
@@ -299,13 +299,24 @@ impl Block for Backlight {
         if self.invert_icons {
             brightness = 100 - brightness;
         }
-        match brightness {
-            0..=19 => self.output.set_icon("backlight_empty"),
-            20..=39 => self.output.set_icon("backlight_partial1"),
-            40..=59 => self.output.set_icon("backlight_partial2"),
-            60..=79 => self.output.set_icon("backlight_partial3"),
-            _ => self.output.set_icon("backlight_full"),
-        }
+        self.output.set_icon(match brightness {
+            0..=6 => "backlight_empty",
+            7..=13 => "backlight_1",
+            14..=20 => "backlight_2",
+            21..=26 => "backlight_3",
+            27..=33 => "backlight_4",
+            34..=40 => "backlight_5",
+            41..=46 => "backlight_6",
+            47..=53 => "backlight_7",
+            54..=60 => "backlight_8",
+            61..=67 => "backlight_9",
+            68..=73 => "backlight_10",
+            74..=80 => "backlight_11",
+            81..=87 => "backlight_12",
+            88..=93 => "backlight_13",
+            _ => "backlight_full",
+        });
+
         Ok(None)
     }
 

diff --git a/src/icons.rs b/src/icons.rs
@@ -7,9 +7,19 @@ lazy_static! {
         "" => "",
         "backlight_empty" => "BRIGHT",
         "backlight_full" => "BRIGHT",
-        "backlight_partial1" => "BRIGHT",
-        "backlight_partial2" => "BRIGHT",
-        "backlight_partial3" => "BRIGHT",
+        "backlight_1" =>  "BRIGHT",
+        "backlight_2" =>  "BRIGHT",
+        "backlight_3" =>  "BRIGHT",
+        "backlight_4" =>  "BRIGHT",
+        "backlight_5" =>  "BRIGHT",
+        "backlight_6" =>  "BRIGHT",
+        "backlight_7" =>  "BRIGHT",
+        "backlight_8" =>  "BRIGHT",
+        "backlight_9" =>  "BRIGHT",
+        "backlight_10" => "BRIGHT",
+        "backlight_11" => "BRIGHT",
+        "backlight_12" => "BRIGHT",
+        "backlight_13" => "BRIGHT",
         "bat" => "BAT",
         "bat_charging" => "CHG",
         "bat_discharging" => "DCG",
@@ -82,9 +92,19 @@ lazy_static! {
         "" => "",
         "backlight_empty" => "\u{1f315}",
         "backlight_full" => "\u{1f311}",
-        "backlight_partial1" => "\u{1f314}",
-        "backlight_partial2" => "\u{1f313}",
-        "backlight_partial3" => "\u{1f312}",
+        "backlight_1" =>  "\u{1f314}",
+        "backlight_2" =>  "\u{1f314}",
+        "backlight_3" =>  "\u{1f314}",
+        "backlight_4" =>  "\u{1f314}",
+        "backlight_5" =>  "\u{1f313}",
+        "backlight_6" =>  "\u{1f313}",
+        "backlight_7" =>  "\u{1f313}",
+        "backlight_8" =>  "\u{1f313}",
+        "backlight_9" =>  "\u{1f313}",
+        "backlight_10" => "\u{1f312}",
+        "backlight_11" => "\u{1f312}",
+        "backlight_12" => "\u{1f312}",
+        "backlight_13" => "\u{1f312}",
         "bat_charging" => "\u{f1e6}", // fa-plug
         "bat_discharging" => "\u{f242}", // fa-battery-half
         "bat_empty" => "\u{f244}", // fa-battery-empty
@@ -159,9 +179,19 @@ lazy_static! {
         "" => "",
         "backlight_empty" => "\u{1f315}",
         "backlight_full" => "\u{1f311}",
-        "backlight_partial1" => "\u{1f314}",
-        "backlight_partial2" => "\u{1f313}",
-        "backlight_partial3" => "\u{1f312}",
+        "backlight_1" =>  "\u{1f314}",
+        "backlight_2" =>  "\u{1f314}",
+        "backlight_3" =>  "\u{1f314}",
+        "backlight_4" =>  "\u{1f314}",
+        "backlight_5" =>  "\u{1f313}",
+        "backlight_6" =>  "\u{1f313}",
+        "backlight_7" =>  "\u{1f313}",
+        "backlight_8" =>  "\u{1f313}",
+        "backlight_9" =>  "\u{1f313}",
+        "backlight_10" => "\u{1f312}",
+        "backlight_11" => "\u{1f312}",
+        "backlight_12" => "\u{1f312}",
+        "backlight_13" => "\u{1f312}",
         "bat_charging" => "\u{f1e6}",
         "bat_discharging" => "\u{f242}",
         "bat_empty" => "\u{f244}",
@@ -287,9 +317,19 @@ lazy_static! {
         "" => "",
         "backlight_empty" => "\u{e38d}", // nf-weather-moon_new
         "backlight_full" => "\u{e39b}", // nf-weather-moon_full
-        "backlight_partial1" => "\u{e3d1}", // nf-weather-moon_alt_waxing_gibbous_3
-        "backlight_partial2" => "\u{e3ce}", // nf-weather-moon_alt_first_quarter
-        "backlight_partial3" => "\u{e3cb}", // nf-weather-moon_alt_waxing_crescent_4
+        "backlight_1" => "\u{e3d4}", // nf-weather-moon_alt_waxing_gibbous_6
+        "backlight_2" => "\u{e3d3}", // nf-weather-moon_alt_waxing_gibbous_5
+        "backlight_3" => "\u{e3d2}", // nf-weather-moon_alt_waxing_gibbous_4
+        "backlight_4" => "\u{e3d1}", // nf-weather-moon_alt_waxing_gibbous_3
+        "backlight_5" => "\u{e3d0}", // nf-weather-moon_alt_waxing_gibbous_2
+        "backlight_6" => "\u{e3cf}", // nf-weather-moon_alt_waxing_gibbous_1
+        "backlight_7" => "\u{e3ce}", // nf-weather-moon_alt_first_quarter
+        "backlight_8" => "\u{e3cd}", // nf-weather-moon_alt_waxing_crescent_6
+        "backlight_9" => "\u{e3cc}", // nf-weather-moon_alt_waxing_crescent_5
+        "backlight_10" => "\u{e3cb}", // nf-weather-moon_alt_waxing_crescent_4
+        "backlight_11" => "\u{e3ca}", // nf-weather-moon_alt_waxing_crescent_3
+        "backlight_12" => "\u{e3c9}", // nf-weather-moon_alt_waxing_crescent_2
+        "backlight_13" => "\u{e3c8}", // nf-weather-moon_alt_waxing_crescent_1
         "bat_charging" => "\u{f583}", // nf-mdi-battery_charging
         "bat_discharging" => "\u{f57d}", // nf-mdi-battery_50
         "bat_empty" => "\u{f58d}", // nf-mdi-battery_outline