4 files changed, 81 insertions, 52 deletions
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 42c5e7b..0000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,32 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Smartphone (please complete the following information):**
- - Device: [e.g. Pixel 5a]
- - OS: [e.g. Android 9]
- - Version [e.g. 3.2]
-
-**Additional context**
-Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 0000000..7132a72
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,61 @@
+name: ❌ Bug report
+description: Report errors or unexpected behavior
+labels: ❌ bug
+body:
+- type: checkboxes
+  attributes:
+      label: 🧐 Have you fully read the README and viewed similar issues?
+      description: Please read the <a href="https://github.com/xManager-v2/xManager-Spotify/blob/main/README.md">README</a>. Also check the open and closed <a href="https://github.com/xManager-v2/xManager-Spotify/issues">issue</a> because your issue may have already been fixed.
+      options:
+        - label: I have read the README
+          required: true
+        - label: I have checked older issues, open and closed
+          required: true
+        - label: I did a clean install of xManager
+          required: true
+        - label: This is an xManager app issue -- NOT a Spotify mod issue
+          required: true
+- type: markdown
+  attributes:
+    value: "###"    
+- type: textarea
+  attributes:
+    label: ℹ Information
+    description: |
+      - Device Model: e.g. <kbd>Pixel 7 Pro</kbd> 
+      - Android Version: e.g. <kbd>Android 13</kbd>
+      - ROM Version: e.g. <kbd>stock</kbd>
+        - If using unmodified device, list as `stock`. If using a custom ROM, list ROM used, e.g. `LineageOS 20`
+      - xManager Version: e.g. <kbd>4.1</kbd>
+        - Open xManager, in the bottom section, click <kbd>About ℹ</kbd>
+        - Report version # at top of screen
+    placeholder: |
+        - Device Model:  
+        - Android Version:  
+        - ROM Version:  
+        - xManager Version:  
+    value: |
+        - Device Model:  
+        - Android Version:  
+        - ROM Version:  
+        - xManager Version:  
+    render: markdown   
+  validations:
+    required: true    
+- type: textarea
+  attributes:
+    label: 📝 Description
+    description: List steps to reproduce the error and details on what happens and what you expected to happen.
+    value: |
+      1.
+      2.
+      3.
+      ...
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: 📸 Screenshots
+    description: Place any screenshots of the issue here if needed
+  validations:
+    required: false    
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index bbcbbe7..0000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
diff --git a/.github/ISSUE_TEMPLATE/idea.yml b/.github/ISSUE_TEMPLATE/idea.yml
new file mode 100644
index 0000000..1b46e78
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/idea.yml
@@ -0,0 +1,20 @@
+name: 💡 Suggest an idea
+description: Suggest a new feature or improvement
+labels: 💡 enhancement
+body:
+- type: textarea
+  attributes:
+    label: Description of the new feature / enhancement
+    description: A clear and concise description of what the problem is that the new feature would solve. Describe why and how a user would use this new functionality (if applicable)
+    value: |
+        - 1
+        - 2
+        - 3
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: 📸 Screenshots
+    description: Place any screenshots of the issue here if needed
+  validations:
+    required: false