Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PIC component #3187

Open
wants to merge 29 commits into
base: ucr
Choose a base branch
from
Open

PIC component #3187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
26b3782
setup for PersonalImageClassifier
SimoneSantin May 28, 2024
b3e216e
setup common abstract class
SimoneSantin May 30, 2024
37be69c
setup for PIC
SimoneSantin Jun 5, 2024
881935c
main functions android PIC
SimoneSantin Jun 8, 2024
3d27da3
Fix bugs
SimoneSantin Jun 8, 2024
d4641fa
PIC designer bug fixed
SimoneSantin Jun 9, 2024
10d13e2
Fix webView loadUrL
SimoneSantin Jun 12, 2024
2a47029
WebView error communication fixed
SimoneSantin Jun 17, 2024
630a58f
setup BaseAiComponent.swift
SimoneSantin Jun 19, 2024
5e636ae
implemented new functions in BaseAiComponent.swift
SimoneSantin Jun 20, 2024
c11e4f0
Implemented WKURLSchemeHandler in BaseAiComponent.swift
SimoneSantin Jun 21, 2024
e5c7ec6
Implemented classification feature in PIC.swift and added new error c…
SimoneSantin Jun 23, 2024
11b6ae9
implemented classifyImageData function in personalImageClassifier.swift
SimoneSantin Jun 25, 2024
62cf04c
fixed variable error
SimoneSantin Jun 26, 2024
4e40913
implemented classifyImage function in PIC.swift
SimoneSantin Jun 25, 2024
99c2d33
fixed syntax errors in PersonalImageClassifier.swift
SimoneSantin Jul 8, 2024
59e05c2
fixed syntax errors in PersonalImageClassifier.swift
SimoneSantin Jul 9, 2024
f688524
removed unnecessary file
SimoneSantin Jul 9, 2024
9b572f6
Add resources and classes for iOS PIC
ewpatton Jul 17, 2024
6eac37e
Directly use companion assets for transfer models
ewpatton Jul 17, 2024
8f02eea
Rebuild documentation
ewpatton Jul 17, 2024
7c3a2b9
Fixed syntax errors in BaseAiComponent.swift and PersonalImageClassif…
Jul 17, 2024
61b13eb
Merge branch ios
Jul 18, 2024
1b4aec4
Fixed compilation errors in PersonalImageClassifier.swift and BaseAiC…
Jul 27, 2024
93f77ea
Fixed errors in PersonalImageClassifier.swift and added more print fo…
Jul 31, 2024
8931504
Updated send functions in javascript code
Aug 2, 2024
415533c
Fixed connection bugs of the WKWebview
Aug 10, 2024
9d9b83d
Fix appinventor: scheme handling for PIC
ewpatton Aug 21, 2024
d2c70d0
Fix alist lookup when processing PIC results on iOS
ewpatton Aug 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 21 additions & 6 deletions appinventor/AICompanionApp.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,7 @@
TargetAttributes = {
06463EF71D95956800B23DCD = {
CreatedOnToolsVersion = 8.0;
DevelopmentTeam = TWJ6NF5SLA;
LastSwiftMigration = 1100;
ProvisioningStyle = Manual;
};
Expand Down Expand Up @@ -470,6 +471,7 @@
"${BUILT_PRODUCTS_DIR}/SwiftSVG/SwiftSVG.framework",
"${BUILT_PRODUCTS_DIR}/SwiftyBase64/SwiftyBase64.framework",
"${BUILT_PRODUCTS_DIR}/Toast-Swift/Toast_Swift.framework",
"${BUILT_PRODUCTS_DIR}/ZIPFoundation/ZIPFoundation.framework",
"${BUILT_PRODUCTS_DIR}/ZXingObjC/ZXingObjC.framework",
"${BUILT_PRODUCTS_DIR}/Zip/Zip.framework",
"${BUILT_PRODUCTS_DIR}/geos/geos.framework",
Expand All @@ -492,6 +494,7 @@
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftSVG.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftyBase64.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Toast_Swift.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ZIPFoundation.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ZXingObjC.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Zip.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/geos.framework",
Expand Down Expand Up @@ -578,6 +581,7 @@
"${BUILT_PRODUCTS_DIR}/SwiftSVG/SwiftSVG.framework",
"${BUILT_PRODUCTS_DIR}/SwiftyBase64/SwiftyBase64.framework",
"${BUILT_PRODUCTS_DIR}/Toast-Swift/Toast_Swift.framework",
"${BUILT_PRODUCTS_DIR}/ZIPFoundation/ZIPFoundation.framework",
"${BUILT_PRODUCTS_DIR}/ZXingObjC/ZXingObjC.framework",
"${BUILT_PRODUCTS_DIR}/Zip/Zip.framework",
"${BUILT_PRODUCTS_DIR}/geos/geos.framework",
Expand All @@ -600,6 +604,7 @@
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftSVG.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftyBase64.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Toast_Swift.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ZIPFoundation.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ZXingObjC.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Zip.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/geos.framework",
Expand Down Expand Up @@ -807,18 +812,23 @@
baseConfigurationReference = 917EBEF8E1E3632C01B06EE1 /* Pods-AICompanionApp.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = TWJ6NF5SLA;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/prebuilts/$(PLATFORM_NAME)",
);
INFOPLIST_FILE = aicompanionapp/src/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = edu.mit.appinventor.aicompanion3;
PRODUCT_BUNDLE_IDENTIFIER = com.evanpatton.aicompanion4;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "9c96ca04-1d70-4a2b-bb01-28f545b35d28";
PROVISIONING_PROFILE_SPECIFIER = "MIT App Inventor Development";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "MIT App Inventor Development";
PROVISIONING_PROFILE_SPECIFIER = "";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "AI2 Companion dev";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
Expand All @@ -829,18 +839,23 @@
baseConfigurationReference = FE5CAE0EE58EBC32C4E5ADFC /* Pods-AICompanionApp.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = TWJ6NF5SLA;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/prebuilts/$(PLATFORM_NAME)",
);
INFOPLIST_FILE = aicompanionapp/src/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = edu.mit.appinventor.aicompanion3;
PRODUCT_BUNDLE_IDENTIFIER = com.evanpatton.aicompanion4;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "9c96ca04-1d70-4a2b-bb01-28f545b35d28";
PROVISIONING_PROFILE_SPECIFIER = "MIT App Inventor Production";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "MIT App Inventor Production";
PROVISIONING_PROFILE_SPECIFIER = "";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "AI2 Companion dev";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
Expand Down
22 changes: 6 additions & 16 deletions appinventor/AICompanionApp.xcodeproj/xcshareddata/xcschemes/AICompanionApp.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,23 +79,13 @@
ReferencedContainer = "container:AICompanionApp.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
<AdditionalOption
key = "MallocStackLogging"
value = ""
<EnvironmentVariables>
<EnvironmentVariable
key = "IDEPreferLogStreaming"
value = "YES"
isEnabled = "YES">
</AdditionalOption>
<AdditionalOption
key = "PrefersMallocStackLoggingLite"
value = ""
isEnabled = "YES">
</AdditionalOption>
<AdditionalOption
key = "MallocScribble"
value = ""
isEnabled = "YES">
</AdditionalOption>
</AdditionalOptions>
</EnvironmentVariable>
</EnvironmentVariables>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand Down
Loading