Merge pull request #15 from lucmos/develop

Release 0.0.6

Author: lucmos

src/powermanim/components/_powermanim.py src/powermanim/components/powermanim.pysrc/powermanim/components/_powermanim.py renamed to src/powermanim/components/powermanim.py

@@ -15,40 +15,49 @@ def build_shapes(self):
         logo_green = "#87c2a5"
         logo_blue = "#525893"
         logo_red = "#e07a5f"
+
         circle = Circle(color=logo_green, fill_opacity=1).shift(LEFT)
-        square = Difference(Square().shift(UP), circle, color=logo_blue, fill_opacity=1).shift(UR * 0.2)
-        triangle = Difference(Triangle().shift(RIGHT), square, color=logo_red, fill_opacity=1).shift(DR * 0.2)
+
+        square = Square(color=logo_blue, fill_opacity=1).shift(UP)
+        triangle = Triangle(color=logo_red, fill_opacity=1).shift(RIGHT)
+
+        square = Difference(square, circle, color=logo_blue, fill_opacity=1)
+        triangle = Difference(triangle, square, color=logo_red, fill_opacity=1)
+
+        circle.shift(DL * self.gap)
+        triangle.shift(DR * self.gap)
+
         return VGroup(circle, square, triangle)
 
     def build_text(self):
-        logo_black = "#343434"
-        ds_m = MathTex(r"\mathbb{PM}", fill_color=logo_black).scale(5)
+        ds_m = MathTex(r"\mathbb{PM}", fill_color=self.logo_black).scale(5)
         ds_m.shift(4.25 * LEFT + 1.5 * UP)
         return ds_m
 
     def build_banner(self):
         shapes = self.build_shapes()
 
-        font_color = "#343434"
-        logo_black = "#343434"
-
-        ds_p = MathTex(r"\mathbb{P}", fill_color=logo_black).scale(2)
+        ds_p = MathTex(r"\mathbb{P}", fill_color=self.logo_black).scale(2)
         ower = Tex("ower", tex_template=TexFontTemplates.gnu_freeserif_freesans).scale(2)
-        ower.next_to(ds_p, RIGHT, buff=SMALL_BUFF).align_to(ds_p, DOWN).set_color(font_color)
+        ower.next_to(ds_p, RIGHT, buff=SMALL_BUFF).align_to(ds_p, DOWN).set_color(self.font_color)
         power = VGroup(ds_p, ower)
 
-        ds_m = MathTex(r"\mathbb{M}", fill_color=logo_black).scale(2)
+        ds_m = MathTex(r"\mathbb{M}", fill_color=self.logo_black).scale(2)
         anim = Tex("anim", tex_template=TexFontTemplates.gnu_freeserif_freesans).scale(2)
-        anim.next_to(ds_m, RIGHT, buff=SMALL_BUFF).align_to(ds_m, DOWN).set_color(font_color)
+        anim.next_to(ds_m, RIGHT, buff=SMALL_BUFF).align_to(ds_m, DOWN).set_color(self.font_color)
         tmanim = VGroup(ds_m, anim)
 
         banner = VGroup(power, tmanim).arrange(RIGHT, buff=MED_SMALL_BUFF).move_to(ORIGIN).scale(1.5)
-        banner.shift(UP * 0.5 + LEFT * 0.5)
-        shapes.next_to(banner.get_critical_point(DR), DR, buff=-1)
+        banner.next_to(shapes[1], LEFT)
+        banner.align_to(shapes[0].get_critical_point(UP) + self.gap, DOWN)
 
         return VGroup(shapes, banner).move_to(ORIGIN)
 
-    def __init__(self):
+    def __init__(self, font_color="#343434", logo_black="#343434", gap=0.4):
+        self.font_color = font_color
+        self.logo_black = logo_black
+        self.gap = gap
+
         shapes = self.build_shapes()
         ds_m = self.build_text()
         super().__init__(*shapes, ds_m)

src/powermanim/layouts/arrangedbullets.py

@@ -12,6 +12,7 @@ def __init__(
         group: T.Optional[int] = None,
         adjustment: float = 0.0,
         symbol: T.Optional[str] = r"\bullet",
+        autoplace: bool = True,
         **kwargs,
     ):
         """A class to represent a bullet point.
@@ -22,13 +23,13 @@ def __init__(
             group: The group the bullet point belongs to, controls the animations.
             adjustment: The adjustment of the bullet.
             symbol: The symbol to be displayed as the bullet.
-            symbol_buff: The spacing between the bullet and the text.
-            text_components_buff: The spacing between the text components.
+            autoplace: Whether to automatically place the bullet point.
         """
         self.level = level
         self.adjustment = adjustment
         self.group = group
         self.symbol = symbol
+        self.autoplace = autoplace
 
         first_text, *rest_text = text
         if symbol is not None:
@@ -95,6 +96,18 @@ def __init__(
 
 
 class ArrangedBullets(VGroup):
+    def arrage_rows(self, rows: T.Iterable[T.Union[MathBullet, Bullet, MathTex, Tex, Text]]):
+        bullet_rows: T.Iterable[MathBullet] = (
+            VGroup(*rows)
+            .arrange(DOWN, aligned_edge=LEFT, buff=self.line_spacing)
+            .to_edge(LEFT, buff=self.left_buff)
+            .shift(self.global_shift)
+        )
+
+        for row in bullet_rows:
+            row.indent(indent_buff=self.indent_buff)
+            row.adjust()
+
     def __init__(
         self,
         *rows: T.Union[MathBullet, Bullet, MathTex, Tex, Text],
@@ -118,25 +131,17 @@ def __init__(
         self.global_shift = global_shift
 
         rows = [(row if isinstance(row, MathBullet) else Bullet(row)) for row in rows]
-        bullet_rows: T.Iterable[MathBullet] = (
-            VGroup(*rows)
-            .arrange(DOWN, aligned_edge=LEFT, buff=line_spacing)
-            .to_edge(LEFT, buff=left_buff)
-            .shift(global_shift)
-        )
 
-        for row in bullet_rows:
-            row.indent(indent_buff=indent_buff)
-            row.adjust()
+        self.arrage_rows((row for row in rows if row.autoplace))
 
-        groups = [row.group for row in bullet_rows]
+        groups = [row.group for row in rows]
 
         # If there is a None and aso something else
         if (None in groups) and len(set(groups)) != 1:
             raise ValueError("The groups must be specified for all or no bullets at all.")
 
         group2bullet = defaultdict(list)
-        for i, row in enumerate(bullet_rows):
+        for i, row in enumerate(rows):
             group = row.group
             if group is None:
                 group = i