diff --git a/.github/ISSUE_TEMPLATE/icon_rebrand.yml b/.github/ISSUE_TEMPLATE/icon_rebrand.yml
index 65dfccbf3..90fef3c53 100644
--- a/.github/ISSUE_TEMPLATE/icon_rebrand.yml
+++ b/.github/ISSUE_TEMPLATE/icon_rebrand.yml
@@ -11,8 +11,8 @@ body:
You can find the current icon and application name in [the appfilter.xml](https://github.com/LawnchairLauncher/lawnicons/blob/develop/app/assets/appfilter.xml). For example, you found "...**drawable="ladb" name="ADB Shell" />**". The icon is [ladb](https://github.com/LawnchairLauncher/lawnicons/tree/develop/svgs/ladb.svg) and the application name is **ADB Shell**.
**Sample response**
- Now: Twitter, [twitter.svg](https://github.com/LawnchairLauncher/lawnicons/tree/develop/svgs/)
- New: X, [fresh icon](https://cdn.cms-twdigitalassets.com/content/dam/about-twitter/x/brand-toolkit/logo-black.png.twimg.2560.png)
+ Now: Twitter, https://github.com/LawnchairLauncher/lawnicons/tree/develop/svgs/twitter.svg
+ New: X, https://cdn.cms-twdigitalassets.com/content/dam/about-twitter/x/brand-toolkit/logo-black.png.twimg.2560.png
placeholder: Tell us what should be changed and how
validations:
diff --git a/README.md b/README.md
index 7adfaf751..c4ee1c011 100644
--- a/README.md
+++ b/README.md
@@ -51,6 +51,9 @@ Please see our guidelines for information on contributing icons or code, it will
[Lawnicons guidelines](CONTRIBUTING.md) • [Icon samples in Figma](https://www.figma.com/community/file/1227718471680779613) • [Popular icon requests](https://docs.google.com/spreadsheets/d/1AXc9EDXA6udZeGROtB5nuABjM33VluGY_V24tIzHaKc/edit?resourcekey=&gid=609680142#gid=609680142) • [Development issues](https://github.com/LawnchairLauncher/lawnicons/issues)
## Requesting icons
+> [!NOTE]
+> Request acceptance is currently closed.
+
`Open Lawnicons 2.10+ → Tap "Request icons" → Submit the response`
-[Icon request form](https://forms.gle/xt7sJhgWEasuo9TR9) • [Report outdated icons](https://github.com/LawnchairLauncher/lawnicons/issues/new?assignees=&labels=icon+update&projects=&template=icon_rebrand.yml)
+[Report outdated icons](https://github.com/LawnchairLauncher/lawnicons/issues/new?assignees=&labels=icon+update&projects=&template=icon_rebrand.yml)
diff --git a/app/assets/appfilter.xml b/app/assets/appfilter.xml
index 8d869c18d..3e2eab776 100644
--- a/app/assets/appfilter.xml
+++ b/app/assets/appfilter.xml
@@ -130,8 +130,8 @@
-:white_check_mark: `python3 icontool.py -m add ...`
-
## Adding icons
```console
python3 icontool.py add /path/to/icon com.app.app/com.app.app.appActivity "App Name"
@@ -62,12 +51,6 @@ Note that the SVG file's name is based on the `drawable` attribute of the first
Some common utilities are described below.
### Sorting appfilter.xml
-> [!WARNING]
-> At the moment, the sorting works with errors: duplicates and extra spaces are added. It is recommended not to use it.
-```console
-python3 ./icontool.py sort
-```
-
This will sort the `appfilter.xml` file via the `name` attribute.
### Finding duplicate entries in appfilter.xml
diff --git a/icontool.py b/icontool.py
index 47e2edd88..8291def65 100755
--- a/icontool.py
+++ b/icontool.py
@@ -1,351 +1,269 @@
#!/usr/bin/env python3
-import xml.etree.ElementTree as ET
import argparse
-import shutil
import os
import re
-
-#
-# Global Variables
-#
-# See https://regex101.com/r/xC9Kh3/2
-PATTERN = re.compile(r"([A-Za-z0-9_]+(\.[A-Za-z0-9_]+)+)\/([A-Za-z0-9_]+(\.[A-Za-z0-9_]+)+)", re.IGNORECASE)
-
-APPFILTER_PATH = "app/assets/appfilter.xml"
-SVGS_FOLDER = "svgs/"
-CALENDAR_REGEX = r"(?s) .*? "
-
-# Helper Functions
+import shutil
+import xml.etree.ElementTree as ElementTree
+
+#####
+# Global variables
+#####
+PATTERN = re.compile(r"([A-Za-z0-9_]+(\.[A-Za-z0-9_]+)+)/([A-Za-z0-9_]+(\.[A-Za-z0-9_]+)+)",
+ re.IGNORECASE)
+APPFILTER_PATH = "./app/assets/appfilter.xml"
+SVGS_FOLDER = "./svgs/"
+CALENDARS_PATTERN = r'( .*?)'
+LAWNICONS_PATTERN = r'\s*(.*?)\s*'
+
+
+#####
+# Helper functions
+#####
def print_error(msg):
- print("\033[91merror:\033[0m " + msg + "\n")
+ print("\033[91m" + "error:\033[0m " + msg + "\n")
exit()
-def print_success():
- print("\033[96msuccessfully completed task(s)\033[0m")
- exit()
-
-#
-# Logic
-#
-def sort_components(xml_file):
- """Sorts XML data by 'name' attribute."""
- def check_calendar_components():
- calendar_stuff = re.findall(CALENDAR_REGEX, xml_file)
- return True if calendar_stuff == None else False
-
- def get_calendar_components():
- # Always get the original file for safety
- original_file = open(APPFILTER_PATH, "r", encoding="utf-8").read()
- calendar_stuff = re.findall(CALENDAR_REGEX, original_file)
- return calendar_stuff
-
- def remove_calendar_components(has_calendar):
- return re.sub(CALENDAR_REGEX, "", xml_file) if has_calendar else xml_file
- def read_calendar_components(xml_data, calendar_stuff):
- return xml_data[:52] + calendar_stuff[0] + "\n" + xml_data[52:] + "\n"
-
- calendar_stuff = get_calendar_components()
- pure_xml_file = remove_calendar_components(check_calendar_components())
+def check_file_existence():
+ if not os.path.exists(SVGS_FOLDER):
+ print_error("svgs folder does not exist. Please ensure the path is correct.")
+ if not os.path.isfile(APPFILTER_PATH):
+ print_error("appfilter.xml file does not exist. Please ensure the path is correct.")
- # Sort the XML by the name tag, thanks https://stackoverflow.com/a/25339725
- xml_data = ET.fromstring(pure_xml_file)
- xml_data[:] = sorted(xml_data, key=lambda child: child.get("name").casefold())
- sorted_xml_data = ET.tostring(xml_data, encoding="unicode")
- sorted_xml_data = '\n\n' + sorted_xml_data
+def validate_component_format(component):
+ if not PATTERN.match(component):
+ print_error(
+ "Invalid component entry. Must be in format [PACKAGE_NAME]/[APP_ACTIVITY_NAME], e.g., package.name/component.name")
+
+
+#####
+# Primary logic
+#####
+def sort_xml_file(file, new_item):
+ # The use of strings instead of XML parsers/ElementTree is to preserve all newlines and comments in the file.
+ dynamic_calendars_section = re.search(CALENDARS_PATTERN, file, re.DOTALL)
+ if dynamic_calendars_section:
+ x = dynamic_calendars_section.group(0)
+ else:
+ x = ""
- sorted_xml_data = read_calendar_components(sorted_xml_data, calendar_stuff)
+ lawnicons_section = re.search(LAWNICONS_PATTERN, file, re.DOTALL)
+ lawnicons_items = lawnicons_section.group(1).strip().splitlines() if lawnicons_section else []
- return sorted_xml_data
+ if new_item:
+ lawnicons_items.append(new_item)
-def check_lawnicons_corruption():
- reply_reason = "this may be due to a broken local copy of lawnicons. please clone lawnicons again."
+ lawnicons_items_sorted = sorted(
+ [" " + line.strip() for line in lawnicons_items if '- 1) and not ("calendar" in i)}
-
- if len(duplicates) == 0:
- print("no duplicates found")
- return
-
- print("duplicates:")
- for i in duplicates:
- print("* " + i)
-
- def find_unused_icons():
- drawables = []
-
- for i in root:
- drawable = str(i.attrib.get("drawable", None)) + ".svg"
- drawables.append(drawable)
-
- unused_list = []
-
- for i in svgs:
- if i not in drawables:
- if not i.startswith("themed_icon_calendar_"):
- unused_list.append(i)
-
- if len(unused_list) == 0:
- print("no unused svg files found")
- return
-
- print("unused svg files:")
- for i in unused_list: print("* " + i)
-
- match mode:
- case "duplicates":
- find_duplicates()
-
- case "unused":
- find_unused_icons()
-
- case _:
- print_error("you must specify a mode {duplicates,unused}")
+def add_or_link_component(link_mode, svg, component, name):
+ validate_component_format(component)
-def sort_logic():
- # print("sorting icons...")
- print("due to several issues, sorting icons manually is temporalily disabled. an alternative is to add an icon first to automatically sort appfilter.xml")
- exit()
- # xml_file = open(APPFILTER_PATH, "r", encoding="utf-8").read()
- # sorted_data = sort_components(xml_file)
+ def is_readable(file_path):
+ return os.path.isfile(file_path) and os.access(file_path, os.R_OK)
- # with open(APPFILTER_PATH, "w", encoding="utf-8") as f:
- # f.write(sorted_data)
+ def prompt_user_for_replacement(svg_file):
+ options = ["y", "n", "l"]
+ while True:
+ user_input = input(
+ f"\033[93mwarning\033[0m: svg \033[4m{svg_file}\033[0m already exists in the svgs directory. Replace? (Yes/No/Link) [N] ").lower()
+ if user_input in options:
+ return user_input
+ print("Invalid input, please enter 'y', 'n', or 'l'.")
-def parse_component(link_mode, svg, component, name, show_message):
- #
- # Initialization
- #
+ def copy_svg_to_svgs_folder(svg_file, svg_file_in_folder):
+ try:
+ shutil.copyfile(svg_file, svg_file_in_folder)
+ except shutil.SameFileError:
+ print_error(
+ f"The source and destination SVG are identical: '{os.path.basename(svg_file)}'")
+ except (PermissionError, FileNotFoundError) as e:
+ print_error(f"Error copying file: {str(e)}")
+ except Exception as e:
+ print_error(f"Unexpected error while copying file: {str(e)}")
+
+ # SVG checks
if not svg.endswith(".svg"):
svg += ".svg"
-
basename = os.path.basename(svg)
- if not PATTERN.match(component):
- print_error("invalid component entry. must be in format \033[4m[PACKAGE_NAME]/[APP_ACTIVITY_NAME]\033[0m, i.e: package.name/component.name")
-
- # Link mode true
if link_mode:
- if not os.path.isfile(SVGS_FOLDER + svg):
- print_error(f"svg '{svg}' doesn't exist in the svgs directory.")
-
- # Link mode false
+ if not is_readable(os.path.join(SVGS_FOLDER, svg)):
+ print_error(f"SVG '{svg}' doesn't exist in the svgs directory.")
else:
- if not os.path.isfile(svg):
- path = f"directory `{os.path.dirname(svg)}/`"
- print(path)
- if path == "directory `.`" or path == "directory ``":
- path = "current directory"
-
- print_error(f"svg '{basename}' doesn't exist in {path}. check if the file exists and try again.")
-
- if os.path.isfile(SVGS_FOLDER + basename):
- user_input = input(f"\033[93mwarning\033[0m: svg \033[4m{basename}\033[0m already exists in the svgs directory. replace? (Yes/No/Link) [N] ").lower()
- if user_input == "" or user_input[0] == "n":
+ if not is_readable(svg):
+ print_error(f"SVG '{basename}' doesn't exist in the current directory.")
+
+ # Handle file replacement
+ if is_readable(os.path.join(SVGS_FOLDER, basename)):
+ prompt_input = prompt_user_for_replacement(basename)
+ if prompt_input == "n":
exit()
-
- if user_input[0] == "l":
- parse_component(True, basename, component, name, show_message)
+ elif prompt_input == "l":
+ add_or_link_component(True, basename, component, name)
return
-
- if user_input[0] != "y": exit()
-
- print(f"replacing {basename} in svgs folder...")
-
- svg_in_svgs_folder = SVGS_FOLDER + basename
-
- try:
- shutil.copyfile(svg, svg_in_svgs_folder)
- except shutil.SameFileError:
- print_error(f"\033[4m{basename}\033[0m has the same contents as \033[4m{svg_in_svgs_folder}\033[0m. cannot continue")
+ elif prompt_input == "y":
+ print(f"Replacing {basename} in svgs folder...")
- #
- # Writing to file
- #
+ svg_in_svgs_folder = os.path.join(SVGS_FOLDER, basename)
+ copy_svg_to_svgs_folder(svg, svg_in_svgs_folder)
- # Remove .svg extension
drawable = basename[:-4]
- # xml_file the actual xml file
- # line the actual xml element in string form
- # pure_xml_file the xml file without the calendar declarations
- xml_file = open(APPFILTER_PATH, "r", encoding="utf-8").read()
-
line = f'
- `", action="store_true")
-
-# Add parser
-parser_add.add_argument(
- "svg", help="the path of the SVG file that will be added")
-parser_add.add_argument(
- "component", help="the component name. format must be `[PACKAGE_NAME]/[APP_ACTIVITY_NAME]`")
-parser_add.add_argument(
- "name", help="the displayed name of the app. if multiple lines, use a string like ``\"App Name\"`")
-
-# Link parser
-parser_link.add_argument("svg", help="the file name of the SVG icon.")
-parser_link.add_argument(
- "component", help="the component name. format must be `[PACKAGE_NAME]/[APP_ACTIVITY_NAME]`")
-parser_link.add_argument(
- "name", help="the displayed name of the app. if multiple lines, use a string like ``\"App Name\"`")
-
-# No additional arguments for `sort` parser
-
-# Find parser
-parser_find.add_argument("mode", help="the mode to use {duplicates, unused}.`duplicates` = find duplicates in appfilter.xml.`unused` = find unused files in svgs/")
-
-args = parser.parse_args()
-
-#
-# Main Functions
-#
-check_lawnicons_corruption()
-
-# Match proper subcommand
-match args.subcommand:
- case "add" | "a":
- add_parser(args)
+ match mode:
+ case "duplicates":
+ duplicates = find_duplicates(root)
+ if duplicates:
+ print("Duplicates found:")
+ for dup in duplicates:
+ print("* " + dup)
+ else:
+ print("No duplicates found.")
- case "link" | "l":
- link_parser(args)
+ case "unused":
+ unused = find_unused_icons(root, svgs)
+ if unused:
+ print("Unused SVG files:")
+ for svg in unused:
+ print("* " + svg)
+ else:
+ print("No unused SVG files found.")
- case "remove" | "r" | "d":
- remove_parser(args)
- case "sort" | "s":
- sort_parser()
-
- case "find" | "f":
- find_parser(args)
+def sort_logic():
+ with open(APPFILTER_PATH, "r", encoding="utf-8") as file:
+ sorted_lines = sort_xml_file(file.read(), False)
+ with open(APPFILTER_PATH, "w", encoding="utf-8") as f:
+ f.write(sorted_lines)
- case _:
- print_error("you must specify a subcommand {add,link,remove,sort,find}")
-print_success()
+#####
+# Parser logic
+#####
+
+def parse_args():
+ parser = argparse.ArgumentParser(prog="icontool", description="A CLI tool for managing icons.")
+ subparsers = parser.add_subparsers(dest="command")
+
+ add_parser = subparsers.add_parser("add", help="Add a new component.", aliases=['a'])
+ add_parser.add_argument("svg", help="The name of the SVG file (without .svg extension).")
+ add_parser.add_argument("component",
+ help="Component name in format PACKAGE_NAME/ACTIVITY_NAME.")
+ add_parser.add_argument("name", help="Display name for the component.")
+
+ link_parser = subparsers.add_parser("link", help="Link an existing SVG to a component.",
+ aliases=['l'])
+ link_parser.add_argument("svg", help="The name of the SVG file (without .svg extension).")
+ link_parser.add_argument("component",
+ help="Component name in format PACKAGE_NAME/ACTIVITY_NAME.")
+ link_parser.add_argument("name", help="Display name for the component.")
+
+ remove_parser = subparsers.add_parser("remove", help="Remove a component.", aliases=['r', 'd'])
+ remove_parser.add_argument("component", help="Component name to remove.")
+ remove_parser.add_argument("--delete", action="store_true",
+ help="Delete the associated SVG file.")
+
+ find_parser = subparsers.add_parser("find", help="Find duplicates or unused SVGs.",
+ aliases=['f'])
+ find_parser.add_argument("mode", choices=["duplicates", "unused"],
+ help="Mode to find duplicates or unused SVGs.")
+
+ subparsers.add_parser("sort", help='sorts the appfilter.xml file by component name',
+ aliases=['s'])
+
+ return parser.parse_args()
+
+
+# Main Logic
+check_file_existence()
+args = parse_args()
+
+match args.command:
+ case "add" | "a":
+ add_or_link_component(False, args.svg, args.component, args.name)
+ case "link" | "l":
+ add_or_link_component(True, args.svg, args.component, args.name)
+ case "remove" | "r" | "d":
+ remove_component(args.component, args.delete)
+ case "find" | "f":
+ find_logic(args.mode)
+ case "sort" | "s":
+ sort_logic()
+ case _:
+ print_error("Invalid command. Please use add, link, remove, sort, or find.")
diff --git a/svg-processor/src/main/kotlin/app/lawnchair/lawnicons/helper/AppfilterDiffCreator.kt b/svg-processor/src/main/kotlin/app/lawnchair/lawnicons/helper/AppfilterDiffCreator.kt
index 1e49e4d3a..eaed717ea 100644
--- a/svg-processor/src/main/kotlin/app/lawnchair/lawnicons/helper/AppfilterDiffCreator.kt
+++ b/svg-processor/src/main/kotlin/app/lawnchair/lawnicons/helper/AppfilterDiffCreator.kt
@@ -87,7 +87,7 @@ object AppfilterDiffCreator {
val schema = ""
if (diff.isEmpty()) {
- outputFile.writeText("$schema\n")
+ outputFile.writeText("$schema\n")
return
}
diff --git a/svgs/a101.svg b/svgs/a101.svg
new file mode 100644
index 000000000..f71ec40fb
--- /dev/null
+++ b/svgs/a101.svg
@@ -0,0 +1,41 @@
+
+
diff --git a/svgs/a101_yeni.svg b/svgs/a101_yeni.svg
deleted file mode 100644
index 93fede664..000000000
--- a/svgs/a101_yeni.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/svgs/radarbox.svg b/svgs/airnav_radar.svg
similarity index 100%
rename from svgs/radarbox.svg
rename to svgs/airnav_radar.svg
diff --git a/svgs/image_toolbox.svg b/svgs/image_toolbox.svg
index ebb131b0a..2eecd4664 100644
--- a/svgs/image_toolbox.svg
+++ b/svgs/image_toolbox.svg
@@ -1 +1,41 @@
-
\ No newline at end of file
+
+
diff --git a/svgs/innertune_fork.svg b/svgs/innertune_fork.svg
new file mode 100644
index 000000000..f67836805
--- /dev/null
+++ b/svgs/innertune_fork.svg
@@ -0,0 +1,24 @@
+
+
diff --git a/svgs/nothing_gallery.svg b/svgs/nothing_gallery.svg
new file mode 100644
index 000000000..45fba73f8
--- /dev/null
+++ b/svgs/nothing_gallery.svg
@@ -0,0 +1 @@
+
diff --git a/svgs/ph_diver.svg b/svgs/ph_diver.svg
new file mode 100644
index 000000000..0f573e395
--- /dev/null
+++ b/svgs/ph_diver.svg
@@ -0,0 +1,3 @@
+
diff --git a/svgs/skycards.svg b/svgs/skycards.svg
new file mode 100644
index 000000000..52dc19abe
--- /dev/null
+++ b/svgs/skycards.svg
@@ -0,0 +1,25 @@
+
+
diff --git a/svgs/telegram_monet.svg b/svgs/telegram_monet.svg
deleted file mode 100644
index cfd252505..000000000
--- a/svgs/telegram_monet.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/svgs/tgmonet_theme.svg b/svgs/tgmonet_theme.svg
new file mode 100644
index 000000000..24ad6a834
--- /dev/null
+++ b/svgs/tgmonet_theme.svg
@@ -0,0 +1,64 @@
+
+