Merge v2.6.0

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1 @@
 blank_issues_enabled: false
-contact_links:
-  - name: Icon Request
-    url: https://forms.gle/Fx8vZAiWdW1Tyjo57
-    about: Please request your icons in this form.

.github/ISSUE_TEMPLATE/general_discussion.yml

@@ -1,6 +1,5 @@
 name: General Discussion
 description: Discuss something related to Lawnicons.
-title: "[DISCUSSION] "
 labels: [discussion]
 body:
   - type: textarea

.github/PULL_REQUEST_TEMPLATE/icon_addition.md

@@ -1,30 +1,29 @@
 # Description
 
-<!-- Please provide a short summary of what icons you added, changed, or linked
--->
+<!-- Please provide a short summary of what icons you added, changed, or linked -->
 
 ## Icons addition information
 
-<!-- Please specify if you added an icon that was requested in the icon request form, as seen below -->
+### Added
 
-### Icons added
+App Name (`com.package.app`)
+App Name (`com.package.app`)
+App Name (`com.package.app`)
 
--   App Name (`package.name`) - added from icon request form
--   App Name (`package.name`)
--   App Name (`package.name`)
+### Linked
 
-### Icons updated
+App Name (`com.package.app` → `drawable.svg`)
+App Name (`com.package.app` → `drawable.svg`)
 
--   App Name (`package.name`)
--   App Name (`package.name`)
+### Updated
 
-### Icons linked
-
--   App Name (linked `package.name` to `@drawable/package`)
--   App Name (linked `package.name` to `@drawable/package`)
+App Name (`com.package.app`)
+App Name (`com.package.app`)
 
 ## Contributor's checklist
 
--   [ ] I have followed the [Lawnicons Guidelines](/~https://github.com/k4ustu3h/forkicons/blob/develop/.github/CONTRIBUTING.md)
+<!-- Replace [ ] with [x] to check -->
+
+-   [ ] I have followed the [Lawnicons Guidelines](/~https://github.com/k4ustu3h/forkicons/blob/main/CONTRIBUTING.md)
 -   [ ] I have ensured that Lawnicons builds correctly
 -   [ ] I am willing to make changes to my icons if someone suggests changes

.github/labeler.yml

@@ -0,0 +1,17 @@
+docs:
+  - "*.md"
+  - .github/PULL_REQUEST_TEMPLATE/*.md
+  - .github/pull_request_template.md
+  - docs/**
+
+icons:
+  - svgs/*
+  - app/assets/appfilter.xml
+
+code:
+  - any: ['app/**/*']
+    all: ['!app/assets/appfilter.xml', '!app/src/main/res/*/strings.xml']
+
+locale:
+  - app/src/main/res/*/strings.xml
+

.github/pull_request_template.md

@@ -1,7 +1,7 @@
-<!-- Please select the the `Preview` tab -->
+<!-- Please open the `Preview` tab to select a template -->
 
-Select the appropriate sub-template:
+## Click on the template that fits your PR
 
--   [**Icon addition**](?expand=1&template=icon_addition.md&labels=needs+review,icon+change)
+-   [**Icon addition**](?expand=1&template=icon_addition.md)
 -   [General or miscellaneous change](?expand=1&template=general_change.md)
 -   _[Blank](?expand=1&body=+) (not recommended)_

.github/workflows/build_debug_apk.yml

@@ -33,12 +33,10 @@ jobs:
             echo storeFile='${{ github.workspace }}/key.jks' >> keystore.properties
             echo ${{ secrets.KEYSTORE }} | base64 --decode > ${{ github.workspace }}/key.jks
           fi
-      - name: Prepare Prebuild
-        run: ./gradlew svg-processor:run
       - name: Build debug APK
         run: ./gradlew app:assembleDebug
       - name: Upload artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Debug APK
           path: app/build/outputs/apk/app/debug/*.apk

.github/workflows/build_release_apk.yml

@@ -32,12 +32,10 @@ jobs:
             echo storeFile='${{ github.workspace }}/key.jks' >> keystore.properties
             echo ${{ secrets.KEYSTORE }} | base64 --decode > ${{ github.workspace }}/key.jks
           fi
-      - name: Prepare Prebuild
-        run: ./gradlew svg-processor:run
       - name: Build release APK
         run: ./gradlew app:assembleRelease
       - name: Upload artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Release APK
           path: app/build/outputs/apk/app/release/*.apk

.github/workflows/close_stale_prs.yml

@@ -9,7 +9,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v8.0.0
+      - uses: actions/stale@v9.0.0
         with:
           stale-pr-message: Thanks for your interest in contributing! Unfortunately, we have marked this PR as stale because it has been open for 1 month with no activity. Please apply the suggested changes if there are any, and comment something related to your PR. If you don't take any action for 2 weeks, the PR will be closed.
           close-pr-message: As stated in my previous comment, this PR was closed because it has been stale for another 2 weeks with no activity. Thanks for your interest in contributing though!

.github/workflows/labeler.yml

@@ -0,0 +1,15 @@
+name: "Label PRs"
+
+on:
+  - pull_request_target
+
+jobs:
+  label-prs:
+    permissions:
+      contents: read
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/labeler@v4
+        with:
+          sync-labels: true

CONTRIBUTING.md

@@ -80,8 +80,13 @@ The part before the `/` character in the above image, i.e. `org.telegram.messeng
 #### IconRequest app
 
 1. Download the [IconRequest app](/~https://github.com/Kaiserdragon2/IconRequest/releases).
-2. Launch the app and click "REQUEST NEW" or "UPDATE EXISTING".
-3. Get the Activity details for each app.
+2. Launch the app and click one of the options:
+
+-   UPDATE EXISTING — to copy packages with activities.
+-   REQUEST NEW — to save icon images and packages with activities.
+
+3. Select the apps for which youʼd like to request or make icons.
+4. Copy, save or share.
 
 ![](docs/images/contributing-image-4.png)
 
@@ -90,19 +95,13 @@ The part before the `/` character in the above image, i.e. `org.telegram.messeng
 1. Download the [Icon Pusher app](https://play.google.com/store/apps/details?id=dev.southpaw.iconpusher&hl=en&gl=US).
 2. Launch the app.
 3. Select the icon(s) you want to upload or select all by pressing the square in the top right. Then press "Send".
-4. View the Activity details for each app on the [Icon Pusher website](https://iconpusher.com/). Please make sure the `drawable="[DRAWABLE NAME]"` matches the icon SVG file name.
+4. View the packages with the activities for each app on the [Icon Pusher website](https://iconpusher.com/). Please make sure the `drawable="[DRAWABLE NAME]"` matches the icon SVG file name.
 
 ## Contributing code
 
 While adding icons is the main focus for most contributors, code-related contributions are welcome.
 
-Before building the app, ensure that you create the icon drawables by running:
-
-```console
-./gradlew svg-processor:run
-```
-
-Afterwards, you can build the app by selecting the `appDebug` build variant.
+To build Lawnicons, select the `appDebug` build variant.
 
 Here are a few contribution tips:
 

README.md

@@ -10,7 +10,7 @@ Originally an addon for Lawnchair 12 Alpha 5 and above to implement themed icons
 
 _Forkicons restores the original themed icons of apps and adds icons for apps that doesn't have one, instead of the outlined icons in the original Lawnicons._
 
-Forkicons is best used on [Lawnchair 13](/~https://github.com/LawnchairLauncher/lawnchair). You can enable themed icons on Lawnchair by going to `Home Settings > General > Icon Style > Themed Icons`, choosing "Home Screen" or "Home Screen and App Drawer".
+Forkicons is best used on [Lawnchair 14](/~https://github.com/LawnchairLauncher/lawnchair). You can enable themed icons on Lawnchair by going to `Home Settings > General > Icon Style > Themed Icons`, choosing "Home Screen" or "Home Screen and App Drawer".
 
 This project is mostly supported by our community. If you wish to contribute, check out the Contributing section below.
 
@@ -26,6 +26,10 @@ If you make icons regularly or dozens at once, you can speed up contributing wit
 
 If you are a developer, you may find the [contributing code section](/~https://github.com/k4ustu3h/forkicons/blob/develop/CONTRIBUTING.md#contributing-code) useful.
 
+## Requesting icons
+
+If a previously added icon has a design change, create an [issue](/~https://github.com/k4ustu3h/forkicons/issues).
+
 ## Quick links
 
 [Lawnchair GitHub page](/~https://github.com/LawnchairLauncher/lawnchair)