Skip to content

Commit 2452c19

Browse files
graphefruitgraphefruit
committed
Merge branch 'feature/templates'
2 parents 787337f + 8e7dc6e commit 2452c19

152 files changed

Lines changed: 12252 additions & 1079 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/ISSUE_TEMPLATE/bug_report.yml‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
name: Bug Report
2+
description: Create a report to help us improve Beanconqueror
3+
title: "bug: "
4+
labels: ["bug"]
5+
body:
6+
- type: markdown
7+
attributes:
8+
value: |
9+
Please read the [Contribution Guidelines](https://github.com/graphefruit/Beanconqueror/issues/723) before posting!
10+
11+
This issue tracker is for bugs in Beanconqueror. Please do not use it for support questions or documentation requests.
12+
- type: checkboxes
13+
id: search
14+
attributes:
15+
label: Search for existing issues
16+
description: Please search the internet and existing issues before opening a new one. State why you are opening a new issue if similar ones exist.
17+
options:
18+
- label: I have searched the internet and existing issues. This bug has not been posted yet, or I have a specific reason to post it here.
19+
required: true
20+
- type: input
21+
id: version
22+
attributes:
23+
label: Beanconqueror Version
24+
description: Which version of Beanconqueror are you using? (e.g., 6.4.0)
25+
validations:
26+
required: true
27+
- type: dropdown
28+
id: platform
29+
attributes:
30+
label: Usage System
31+
description: Which platform are you experiencing this issue on?
32+
options:
33+
- Android
34+
- iOS
35+
validations:
36+
required: true
37+
- type: dropdown
38+
id: older-version
39+
attributes:
40+
label: Was this issue present in an older version?
41+
description: Did this issue exist in a previous release, or is it a regression?
42+
options:
43+
- Yes
44+
- No
45+
- I don't know
46+
validations:
47+
required: true
48+
- type: textarea
49+
id: description
50+
attributes:
51+
label: Description
52+
description: A clear and concise description of what the bug is.
53+
validations:
54+
required: true
55+
- type: textarea
56+
id: reproduction
57+
attributes:
58+
label: Steps to Reproduce
59+
description: Please provide clear steps to reproduce the issue.
60+
placeholder: |
61+
1. Go to '...'
62+
2. Click on '...'
63+
3. Scroll down to '...'
64+
4. See error
65+
validations:
66+
required: true
67+
- type: textarea
68+
id: media
69+
attributes:
70+
label: Screenshot or Video
71+
description: Best case scenario, provide a screenshot or a video recording demonstrating the issue.
72+
validations:
73+
required: false
74+
- type: textarea
75+
id: additional-context
76+
attributes:
77+
label: Additional Context
78+
description: Any other context, logs, or details about the problem.
79+
validations:
80+
required: false

‎.github/ISSUE_TEMPLATE/config.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
blank_issues_enabled: false
2+
contact_links:
3+
- name: Documentation
4+
url: https://beanconqueror.com
5+
about: Read the Beanconqueror documentation
6+
- name: Community Discord
7+
url: https://discord.gg/vDzA5dZjG8
8+
about: Ask support questions and chat with the community on Discord
9+
- name: Community Reddit
10+
url: https://www.reddit.com/r/beanconqueror/
11+
about: Ask support questions and discuss on Reddit

‎.github/ISSUE_TEMPLATE/feature_request.yml‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
name: Feature Request
2+
description: Suggest an idea or enhancement for Beanconqueror
3+
title: "feat: "
4+
labels: ["enhancement"]
5+
body:
6+
- type: markdown
7+
attributes:
8+
value: |
9+
Please read the [Contribution Guidelines](https://github.com/graphefruit/Beanconqueror/issues/723) before posting!
10+
- type: checkboxes
11+
id: search
12+
attributes:
13+
label: Search for existing feature requests
14+
description: Please search the existing issues to see if this has already been requested.
15+
options:
16+
- label: I have searched the existing issues.
17+
required: true
18+
- type: textarea
19+
id: description
20+
attributes:
21+
label: Description of the Feature
22+
description: A clear and concise description of what you would like to be added.
23+
validations:
24+
required: true
25+
- type: textarea
26+
id: use-case
27+
attributes:
28+
label: Use Case / Why is it needed?
29+
description: Explain why this feature is useful and what problem it solves.
30+
validations:
31+
required: true
32+
- type: dropdown
33+
id: frequency
34+
attributes:
35+
label: How often would this be used?
36+
description: Please estimate how frequently you or others would use this feature.
37+
options:
38+
- Daily
39+
- Weekly
40+
- Monthly
41+
- Rarely
42+
validations:
43+
required: true
44+
- type: textarea
45+
id: alternatives
46+
attributes:
47+
label: Alternatives Considered
48+
description: A clear and concise description of any alternative solutions or features you've considered.
49+
validations:
50+
required: false

‎.github/workflows/android_nightly.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Android Nightly Build
33
on:
44
push:
55
branches:
6-
- dev
6+
- develop
77

88
jobs:
99
build:
@@ -17,7 +17,7 @@ jobs:
1717
uses: actions/setup-java@v4
1818
with:
1919
distribution: 'zulu'
20-
java-version: '17'
20+
java-version: '21'
2121

2222
- name: Setup Node.js
2323
uses: actions/setup-node@v4

‎android/app/capacitor.build.gradle‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ dependencies {
2727
implementation project(':capawesome-capacitor-android-edge-to-edge-support')
2828
implementation project(':capawesome-capacitor-file-picker')
2929
implementation project(':capgo-camera-preview')
30+
implementation project(':capgo-capacitor-llm')
31+
implementation project(':pantrist-capacitor-plugin-ml-kit-text-recognition')
3032
implementation "androidx.annotation:annotation:*"
3133
implementation "com.google.android.gms:play-services-fitness:21.1.0"
3234
implementation "com.google.android.gms:play-services-auth:20.2.0"

‎android/capacitor.settings.gradle‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,9 @@ project(':capawesome-capacitor-file-picker').projectDir = new File('../node_modu
5555

5656
include ':capgo-camera-preview'
5757
project(':capgo-camera-preview').projectDir = new File('../node_modules/@capgo/camera-preview/android')
58+
59+
include ':capgo-capacitor-llm'
60+
project(':capgo-capacitor-llm').projectDir = new File('../node_modules/@capgo/capacitor-llm/android')
61+
62+
include ':pantrist-capacitor-plugin-ml-kit-text-recognition'
63+
project(':pantrist-capacitor-plugin-ml-kit-text-recognition').projectDir = new File('../node_modules/@pantrist/capacitor-plugin-ml-kit-text-recognition/android')

‎angular.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
}
4747
],
4848
"scripts": [],
49-
"aot": false,
5049
"extractLicenses": false,
5150
"sourceMap": true,
5251
"optimization": false,
@@ -65,7 +64,6 @@
6564
"outputHashing": "all",
6665
"sourceMap": false,
6766
"namedChunks": false,
68-
"aot": true,
6967
"extractLicenses": true,
7068
"budgets": [
7169
{

‎ios/App/App.xcodeproj/project.pbxproj‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@
108108
504EC3011FED79650016851F /* Frameworks */,
109109
504EC3021FED79650016851F /* Resources */,
110110
9592DBEFFC6D2A0C8D5DEB22 /* [CP] Embed Pods Frameworks */,
111+
1AF0D671EF9D70109705F8E9 /* [CP] Copy Pods Resources */,
111112
);
112113
buildRules = (
113114
);
@@ -169,6 +170,21 @@
169170
/* End PBXResourcesBuildPhase section */
170171

171172
/* Begin PBXShellScriptBuildPhase section */
173+
1AF0D671EF9D70109705F8E9 /* [CP] Copy Pods Resources */ = {
174+
isa = PBXShellScriptBuildPhase;
175+
buildActionMask = 2147483647;
176+
files = (
177+
);
178+
inputPaths = (
179+
);
180+
name = "[CP] Copy Pods Resources";
181+
outputPaths = (
182+
);
183+
runOnlyForDeploymentPostprocessing = 0;
184+
shellPath = /bin/sh;
185+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-App/Pods-App-resources.sh\"\n";
186+
showEnvVarsInLog = 0;
187+
};
172188
6634F4EFEBD30273BCE97C65 /* [CP] Check Pods Manifest.lock */ = {
173189
isa = PBXShellScriptBuildPhase;
174190
buildActionMask = 2147483647;

‎ios/App/Podfile‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
require_relative '../../node_modules/@capacitor/ios/scripts/pods_helpers'
22

33
platform :ios, '16.0'
4-
use_frameworks!
4+
use_frameworks! :linkage => :static
55

66
# workaround to avoid Xcode caching of Pods that requires
77
# Product -> Clean Build Folder after new Cordova plugins installed
@@ -28,6 +28,8 @@ def capacitor_pods
2828
pod 'CapacitorStatusBar', :path => '../../node_modules/@capacitor/status-bar'
2929
pod 'CapawesomeCapacitorFilePicker', :path => '../../node_modules/@capawesome/capacitor-file-picker'
3030
pod 'CapgoCameraPreview', :path => '../../node_modules/@capgo/camera-preview'
31+
pod 'CapgoCapacitorLlm', :path => '../../node_modules/@capgo/capacitor-llm'
32+
pod 'PantristCapacitorPluginMlKitTextRecognition', :path => '../../node_modules/@pantrist/capacitor-plugin-ml-kit-text-recognition'
3133
pod 'CordovaPlugins', :path => '../capacitor-cordova-ios-plugins'
3234
end
3335

‎ios/App/Podfile.lock‎

Lines changed: 97 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,71 @@ PODS:
3939
- Capacitor
4040
- CapgoCameraPreview (8.0.14):
4141
- Capacitor
42+
- CapgoCapacitorLlm (8.0.8):
43+
- Capacitor
44+
- MediaPipeTasksGenAI
45+
- MediaPipeTasksGenAIC
4246
- CordovaPlugins (8.0.2):
4347
- CapacitorCordova
48+
- GoogleDataTransport (10.1.0):
49+
- nanopb (~> 3.30910.0)
50+
- PromisesObjC (~> 2.4)
51+
- GoogleMLKit/MLKitCore (8.0.0):
52+
- MLKitCommon (~> 13.0.0)
53+
- GoogleMLKit/TextRecognition (8.0.0):
54+
- GoogleMLKit/MLKitCore
55+
- MLKitTextRecognition (~> 6.0.0)
56+
- GoogleToolboxForMac/Defines (4.2.1)
57+
- GoogleToolboxForMac/Logger (4.2.1):
58+
- GoogleToolboxForMac/Defines (= 4.2.1)
59+
- "GoogleToolboxForMac/NSData+zlib (4.2.1)":
60+
- GoogleToolboxForMac/Defines (= 4.2.1)
61+
- GoogleUtilities/Environment (8.1.0):
62+
- GoogleUtilities/Privacy
63+
- GoogleUtilities/Logger (8.1.0):
64+
- GoogleUtilities/Environment
65+
- GoogleUtilities/Privacy
66+
- GoogleUtilities/Privacy (8.1.0)
67+
- GoogleUtilities/UserDefaults (8.1.0):
68+
- GoogleUtilities/Logger
69+
- GoogleUtilities/Privacy
70+
- GTMSessionFetcher/Core (3.5.0)
4471
- IONFilesystemLib (1.0.1)
4572
- IONGeolocationLib (2.0.0)
73+
- MediaPipeTasksGenAI (0.10.24):
74+
- MediaPipeTasksGenAIC (= 0.10.24)
75+
- MediaPipeTasksGenAIC (0.10.24)
76+
- MLImage (1.0.0-beta7)
77+
- MLKitCommon (13.0.0):
78+
- GoogleDataTransport (~> 10.0)
79+
- GoogleToolboxForMac/Logger (< 5.0, >= 4.2.1)
80+
- "GoogleToolboxForMac/NSData+zlib (< 5.0, >= 4.2.1)"
81+
- GoogleUtilities/Logger (~> 8.0)
82+
- GoogleUtilities/UserDefaults (~> 8.0)
83+
- GTMSessionFetcher/Core (< 4.0, >= 3.3.2)
84+
- MLKitTextRecognition (6.0.0):
85+
- MLKitCommon (~> 13.0)
86+
- MLKitTextRecognitionCommon (= 5.0.0)
87+
- MLKitVision (~> 9.0)
88+
- MLKitTextRecognitionCommon (5.0.0):
89+
- MLKitCommon (~> 13.0)
90+
- MLKitVision (~> 9.0)
91+
- MLKitVision (9.0.0):
92+
- GoogleToolboxForMac/Logger (< 5.0, >= 4.2.1)
93+
- "GoogleToolboxForMac/NSData+zlib (< 5.0, >= 4.2.1)"
94+
- GTMSessionFetcher/Core (< 4.0, >= 3.3.2)
95+
- MLImage (= 1.0.0-beta7)
96+
- MLKitCommon (~> 13.0)
97+
- nanopb (3.30910.0):
98+
- nanopb/decode (= 3.30910.0)
99+
- nanopb/encode (= 3.30910.0)
100+
- nanopb/decode (3.30910.0)
101+
- nanopb/encode (3.30910.0)
46102
- OSBarcodeLib (2.0.1)
103+
- PantristCapacitorPluginMlKitTextRecognition (8.0.0):
104+
- Capacitor
105+
- GoogleMLKit/TextRecognition (= 8.0.0)
106+
- PromisesObjC (2.4.0)
47107

48108
DEPENDENCIES:
49109
- "AparajitaCapacitorDarkMode (from `../../node_modules/@aparajita/capacitor-dark-mode`)"
@@ -65,13 +125,29 @@ DEPENDENCIES:
65125
- "CapacitorStatusBar (from `../../node_modules/@capacitor/status-bar`)"
66126
- "CapawesomeCapacitorFilePicker (from `../../node_modules/@capawesome/capacitor-file-picker`)"
67127
- "CapgoCameraPreview (from `../../node_modules/@capgo/camera-preview`)"
128+
- "CapgoCapacitorLlm (from `../../node_modules/@capgo/capacitor-llm`)"
68129
- CordovaPlugins (from `../capacitor-cordova-ios-plugins`)
130+
- "PantristCapacitorPluginMlKitTextRecognition (from `../../node_modules/@pantrist/capacitor-plugin-ml-kit-text-recognition`)"
69131

70132
SPEC REPOS:
71133
trunk:
134+
- GoogleDataTransport
135+
- GoogleMLKit
136+
- GoogleToolboxForMac
137+
- GoogleUtilities
138+
- GTMSessionFetcher
72139
- IONFilesystemLib
73140
- IONGeolocationLib
141+
- MediaPipeTasksGenAI
142+
- MediaPipeTasksGenAIC
143+
- MLImage
144+
- MLKitCommon
145+
- MLKitTextRecognition
146+
- MLKitTextRecognitionCommon
147+
- MLKitVision
148+
- nanopb
74149
- OSBarcodeLib
150+
- PromisesObjC
75151

76152
EXTERNAL SOURCES:
77153
AparajitaCapacitorDarkMode:
@@ -112,8 +188,12 @@ EXTERNAL SOURCES:
112188
:path: "../../node_modules/@capawesome/capacitor-file-picker"
113189
CapgoCameraPreview:
114190
:path: "../../node_modules/@capgo/camera-preview"
191+
CapgoCapacitorLlm:
192+
:path: "../../node_modules/@capgo/capacitor-llm"
115193
CordovaPlugins:
116194
:path: "../capacitor-cordova-ios-plugins"
195+
PantristCapacitorPluginMlKitTextRecognition:
196+
:path: "../../node_modules/@pantrist/capacitor-plugin-ml-kit-text-recognition"
117197

118198
SPEC CHECKSUMS:
119199
AparajitaCapacitorDarkMode: d5f43e08965abdddef0d03deebf11ab3e8bfe75b
@@ -135,11 +215,27 @@ SPEC CHECKSUMS:
135215
CapacitorStatusBar: 312e2e67928dfe9514c4a8916a1fd610552f5f35
136216
CapawesomeCapacitorFilePicker: cbd96b593d2bfdceb353ed161f9462ce4a9d67a9
137217
CapgoCameraPreview: f171281fbe832ab1a57d6cbef584677fdd27dfff
218+
CapgoCapacitorLlm: 140a45f380578412da3a616338291f48f1acd893
138219
CordovaPlugins: 002b79521e875ec5bdd022e34eaa754941f19e22
220+
GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
221+
GoogleMLKit: ddd51d7dff36ff28defa69afedd9cdce684fd857
222+
GoogleToolboxForMac: d1a2cbf009c453f4d6ded37c105e2f67a32206d8
223+
GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1
224+
GTMSessionFetcher: 5aea5ba6bd522a239e236100971f10cb71b96ab6
139225
IONFilesystemLib: 89258b8e3e85465da93127d25d7ce37f977e8a6f
140226
IONGeolocationLib: a5e40b54edc2ee9902036eda5aaa41ddf07bb68d
227+
MediaPipeTasksGenAI: 076ba7032a6e9da16db9c7cf0c3b67c751c18bc1
228+
MediaPipeTasksGenAIC: ec35d9f431f6a6b651a0bc9f67a4ed149ffa575c
229+
MLImage: 2ab9c968e75f57911c16f4c9d9e8a8e9604a86a1
230+
MLKitCommon: 26b779f072a182c1603d4c88a101c350cac837b1
231+
MLKitTextRecognition: 072488cfd29f1726733378661881f88db74ba3dc
232+
MLKitTextRecognitionCommon: 228502b9dc61ea9cfb6199ebafef3baa842e2043
233+
MLKitVision: fa8dea9012ac59497c79ddbe9ebf32051047ac4c
234+
nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
141235
OSBarcodeLib: 57987d2eb1f916f701f4554e20e349b3cb83f023
236+
PantristCapacitorPluginMlKitTextRecognition: 2963fc7e2a6bd042e2952f2b3fd938963a8fce0f
237+
PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
142238

143-
PODFILE CHECKSUM: a2de8b44acbc16bbe33592cc7d1d7a8fe166d210
239+
PODFILE CHECKSUM: ef625054042c30e858ea7aa52bd8b6c903091364
144240

145241
COCOAPODS: 1.16.2

0 commit comments

Comments
 (0)