Skip to content

Android Updates v0.96.0 #625

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

Merged
danoli3 merged 3 commits into from
Mar 19, 2025
Merged

Android Updates v0.96.0 #625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0084fed
Android Template Updated
danoli3 Mar 19, 2025
b094440
v0.96.0
danoli3 Mar 19, 2025
283ec6a
vs fix
danoli3 Mar 19, 2025
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
8 changes: 3 additions & 5 deletions commandLine/commandLine.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,8 +264,7 @@
<ItemGroup>
<ClCompile Include="src\main.cpp" />
<ClCompile Include="src\addons\ofAddon.cpp" />
<ClCompile Include="src\projects\androidStudioProject.cpp" />
<ClCompile Include="src\projects\android2024.cpp" />
<ClCompile Include="src\projects\android.cpp" />
<ClCompile Include="src\projects\baseProject.cpp" />
<ClCompile Include="src\projects\CBLinuxProject.cpp" />
<ClCompile Include="src\projects\CBWinProject.cpp" />
Expand All @@ -280,8 +279,7 @@
<ItemGroup>
<ClInclude Include="src\optionparser.h" />
<ClInclude Include="src\addons\ofAddon.h" />
<ClInclude Include="src\projects\androidStudioProject.h" />
<ClInclude Include="src\projects\android2024.h" />
<ClInclude Include="src\projects\android.h" />
<ClInclude Include="src\projects\baseProject.h" />
<ClInclude Include="src\projects\CBLinuxProject.h" />
<ClInclude Include="src\projects\CBWinProject.h" />
Expand Down Expand Up @@ -312,4 +310,4 @@
<UserProperties RESOURCE_FILE="icon.rc" />
</VisualStudio>
</ProjectExtensions>
</Project>
</Project>
18 changes: 6 additions & 12 deletions commandLine/commandLine.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,14 @@
objects = {

/* Begin PBXBuildFile section */
03433CF32BF3B842001412CF /* android2024.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 03433CF22BF3B842001412CF /* android2024.cpp */; };
03433CF32BF3B842001412CF /* android.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 03433CF22BF3B842001412CF /* android.cpp */; };
03B57CDD2AC5B1C6005F56E0 /* VSCodeProject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 03B57CDB2AC5B1C6005F56E0 /* VSCodeProject.cpp */; };
"1A7D4C46-3FD3-4E35-9025-D0E93ECAD7DD" /* qtcreatorproject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = "C5A3016A-B663-4FE7-B6E6-421C5F168447" /* qtcreatorproject.cpp */; };
"200CCA92-FAEE-4CEB-903B-ABB0D56B991F" /* ofAddon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = "41F34CBC-2E3E-4C3D-B106-F9D6746B6FF0" /* ofAddon.cpp */; };
"2BC33EEF-CBDE-4E2E-9E0C-DB9AA6E0FE66" /* uuidxx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = "4CB92F80-3CD1-41B1-BD98-26F35C9C7A6E" /* uuidxx.cpp */; };
"317CCC6B-35DE-4343-B4DC-3C797333928C" /* Utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = "7F3C8ACE-56BA-44A0-B365-8499922F1F2C" /* Utils.cpp */; };
"4E6F0A21-B0FF-4E2A-AACF-E1910A0DDE78" /* CBWinProject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = "D8A84D0F-1123-44F7-9D8D-79F8E2A0BFF4" /* CBWinProject.cpp */; };
"653DA9D7-3254-4370-BF70-E18AF5925484" /* CBLinuxProject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = "546BDD51-ACDD-44C1-9C31-E1F3AD19A245" /* CBLinuxProject.cpp */; };
"7F2BBCD1-F22D-454A-9100-33D1C12BEA70" /* androidStudioProject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = "FFD740F7-8E04-4563-A856-D4E402AF9C0E" /* androidStudioProject.cpp */; };
"B07B8E19-F9DE-4E97-8833-859CD9267D30" /* LibraryBinary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = "1EFA4702-B4F3-4556-9C12-4FE21FD503D0" /* LibraryBinary.cpp */; };
BF879F5D2C0F7CEB00200951 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF879F5C2C0F7CEB00200951 /* AVFoundation.framework */; };
BF879F5F2C0F7ED500200951 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF879F5E2C0F7ED500200951 /* Foundation.framework */; };
Expand Down Expand Up @@ -50,8 +49,8 @@
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
03433CF12BF3B842001412CF /* android2024.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = android2024.h; sourceTree = "<group>"; };
03433CF22BF3B842001412CF /* android2024.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = android2024.cpp; sourceTree = "<group>"; };
03433CF12BF3B842001412CF /* android.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = android.h; sourceTree = "<group>"; };
03433CF22BF3B842001412CF /* android.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = android.cpp; sourceTree = "<group>"; };
03B57CDB2AC5B1C6005F56E0 /* VSCodeProject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VSCodeProject.cpp; sourceTree = "<group>"; };
03B57CDC2AC5B1C6005F56E0 /* VSCodeProject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VSCodeProject.h; sourceTree = "<group>"; };
"0C9DC8B7-7304-4A82-BAED-18F7A422ECA1" /* xcodeProject.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = xcodeProject.h; path = src/projects/xcodeProject.h; sourceTree = SOURCE_ROOT; };
Expand All @@ -70,7 +69,6 @@
"52F09B38-455F-4FF2-8E8A-DCA504E2FE8D" /* baseProject.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = baseProject.h; path = src/projects/baseProject.h; sourceTree = SOURCE_ROOT; };
"546BDD51-ACDD-44C1-9C31-E1F3AD19A245" /* CBLinuxProject.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = CBLinuxProject.cpp; path = src/projects/CBLinuxProject.cpp; sourceTree = SOURCE_ROOT; };
"7BB75687-3F31-4D10-BE6A-C7918D1A678D" /* visualStudioProject.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = visualStudioProject.cpp; path = src/projects/visualStudioProject.cpp; sourceTree = SOURCE_ROOT; };
"7D752B3A-9B2F-45F6-94D3-60D5A9600B13" /* androidStudioProject.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = androidStudioProject.h; path = src/projects/androidStudioProject.h; sourceTree = SOURCE_ROOT; };
"7F3C8ACE-56BA-44A0-B365-8499922F1F2C" /* Utils.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = Utils.cpp; path = src/utils/Utils.cpp; sourceTree = SOURCE_ROOT; };
"9314E210-0C9D-4025-9840-CD8122E2DC3D" /* LibraryBinary.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = LibraryBinary.h; path = src/utils/LibraryBinary.h; sourceTree = SOURCE_ROOT; };
"9FAE80C7-5F2A-4E9D-9487-9E2667DE93DA" /* Utils.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = Utils.h; path = src/utils/Utils.h; sourceTree = SOURCE_ROOT; };
Expand All @@ -89,7 +87,6 @@
E4B69E1F0A3A1BDC003C02F2 /* ofApp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofApp.h; path = src/ofApp.h; sourceTree = SOURCE_ROOT; };
E4B6FCAD0C3E899E008CF71C /* openFrameworks-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "openFrameworks-Info.plist"; sourceTree = "<group>"; };
E4EB6923138AFD0F00A09F29 /* Project.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Project.xcconfig; sourceTree = "<group>"; };
"FFD740F7-8E04-4563-A856-D4E402AF9C0E" /* androidStudioProject.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = androidStudioProject.cpp; path = src/projects/androidStudioProject.cpp; sourceTree = SOURCE_ROOT; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -145,10 +142,8 @@
"DDA07621-E95C-4267-B1B9-0127E0215328" /* CBLinuxProject.h */,
"D8A84D0F-1123-44F7-9D8D-79F8E2A0BFF4" /* CBWinProject.cpp */,
"1CFE3EC7-9370-47FF-A02D-1932663E6C10" /* CBWinProject.h */,
03433CF22BF3B842001412CF /* android2024.cpp */,
03433CF12BF3B842001412CF /* android2024.h */,
"FFD740F7-8E04-4563-A856-D4E402AF9C0E" /* androidStudioProject.cpp */,
"7D752B3A-9B2F-45F6-94D3-60D5A9600B13" /* androidStudioProject.h */,
03433CF22BF3B842001412CF /* android.cpp */,
03433CF12BF3B842001412CF /* android.h */,
"247AA402-B7FD-4D0C-BB21-F3A90A35ADE7" /* baseProject.cpp */,
"52F09B38-455F-4FF2-8E8A-DCA504E2FE8D" /* baseProject.h */,
"C5A3016A-B663-4FE7-B6E6-421C5F168447" /* qtcreatorproject.cpp */,
Expand Down Expand Up @@ -352,10 +347,9 @@
"200CCA92-FAEE-4CEB-903B-ABB0D56B991F" /* ofAddon.cpp in Sources */,
"653DA9D7-3254-4370-BF70-E18AF5925484" /* CBLinuxProject.cpp in Sources */,
"4E6F0A21-B0FF-4E2A-AACF-E1910A0DDE78" /* CBWinProject.cpp in Sources */,
"7F2BBCD1-F22D-454A-9100-33D1C12BEA70" /* androidStudioProject.cpp in Sources */,
"E79B31E1-CF27-4D77-B2F2-6AEC329A9F50" /* baseProject.cpp in Sources */,
"1A7D4C46-3FD3-4E35-9025-D0E93ECAD7DD" /* qtcreatorproject.cpp in Sources */,
03433CF32BF3B842001412CF /* android2024.cpp in Sources */,
03433CF32BF3B842001412CF /* android.cpp in Sources */,
"C2428661-BDEC-41D7-8150-C9BA5EE86C0C" /* visualStudioProject.cpp in Sources */,
"DBD7E2AC-672A-4FD9-B0A4-DF24111D17FB" /* xcodeProject.cpp in Sources */,
"B07B8E19-F9DE-4E97-8833-859CD9267D30" /* LibraryBinary.cpp in Sources */,
Expand Down
2 changes: 1 addition & 1 deletion commandLine/src/defines.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#define OFPROJECTGENERATOR_MAJOR_VERSION "0"
#define OFPROJECTGENERATOR_MINOR_VERSION "95"
#define OFPROJECTGENERATOR_MINOR_VERSION "96"
#define OFPROJECTGENERATOR_PATCH_VERSION "0"

#define PG_VERSION (OFPROJECTGENERATOR_MAJOR_VERSION "." OFPROJECTGENERATOR_MINOR_VERSION "." OFPROJECTGENERATOR_PATCH_VERSION)
Expand Down
95 changes: 95 additions & 0 deletions commandLine/src/projects/android.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
#include "android.h"
#include "ofLog.h"
#include "Utils.h"
#include "ofUtils.h"
#include <regex>

std::string androidProject::LOG_NAME = "androidProject";

androidProject::androidProject(const std::string & target) : baseProject(target) {}

bool androidProject::createProjectFile(){

for (auto & f : vector<fs::path> {
"build.gradle",
"gradle",
"gradle.properties",
"local.properties",
"ofApp/gradle.properties",
"ofApp/proguard-rules.pro",
"ofApp/src/AndroidManifest.xml",
"ofApp/src/ic_launcher-playstore.png",
"ofApp/src/CMakeLists.txt",
"ofApp/src/main/main.txt",
"ofApp/build.gradle",
"src/ofApp.h",
"src/ofApp.cpp",
"src/main.cpp",
"proguard.cfg",
"settings.gradle",
"template.config",
}) {
copyTemplateFiles.push_back({
templatePath / f,
projectDir / f
});
}
copyTemplateFiles.push_back({
templatePath / "ofApp" / "build.gradle",
projectDir / "ofApp" / "build.gradle",
{ { "emptyExample", projectName } }
});
for (auto & c : copyTemplateFiles) {
c.run();
}

try {
fs::create_directories(projectDir / "ofApp");
} catch (const std::exception & e) {
ofLogError(LOG_NAME) << "Error creating directories: " << e.what();
return false;
}

// Copy the `src/` folder from the template
try {
fs::copy(
templatePath / "ofApp" / "src",
projectDir / "ofApp" / "src",
fs::copy_options::recursive | (bOverwrite ? fs::copy_options::overwrite_existing : fs::copy_options::update_existing)
);
} catch (fs::filesystem_error & e) {
ofLogError(LOG_NAME) << "Copy failed: " << e.what();
return false;
}

try {
fs::copy(templatePath / "res", projectDir / "ofApp/res", fs::copy_options::recursive);
} catch (fs::filesystem_error & e) {
ofLogError(LOG_NAME) << "Error copying res folder: " << e.what();
}

// Copy additional Android-specific template folders
for (const auto & p : { "srcJava", "gradle" }) { // ✅ Removed "res" from this loop
try {
fs::copy(templatePath / p, projectDir / p, fs::copy_options::recursive);
} catch (fs::filesystem_error & e) {
ofLogError(LOG_NAME) << "Error copying " << p << ": " << e.what();
}
}

findandreplaceInTexfile(projectDir / "ofApp/res/values/strings.xml", "TEMPLATE_APP_NAME", projectName);
fs::path from = projectDir / "srcJava/cc/openframeworks/APP_NAME";
fs::path to = projectDir / ("srcJava/cc/openframeworks/" + projectName);

try {
fs::create_directories(to.parent_path());
fs::rename(from, to);
} catch (const std::exception & e) {
ofLogError(LOG_NAME) << "Error renaming package directory: " << e.what();
}

findandreplaceInTexfile(to / "OFActivity.java", "TEMPLATE_APP_NAME", projectName);

ofLogNotice(LOG_NAME) << "Android Project created successfully!";
return true;
}
4 changes: 2 additions & 2 deletions commandLine/src/projects/android2024.h → commandLine/src/projects/android.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

#include "baseProject.h"

class android2024Project : public baseProject {
class androidProject : public baseProject {
public:
android2024Project(const std::string & target);
androidProject(const std::string & target);

bool createProjectFile() override;
void addInclude(const fs::path & includeName) override {}
Expand Down
82 changes: 0 additions & 82 deletions commandLine/src/projects/android2024.cpp
View file
Open in desktop

This file was deleted.

55 changes: 0 additions & 55 deletions commandLine/src/projects/androidStudioProject.cpp
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions commandLine/src/projects/androidStudioProject.h
View file
Open in desktop

This file was deleted.

10 changes: 3 additions & 7 deletions commandLine/src/utils/Utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
#include "Utils.h"
#include "ofUtils.h"

#include "android2024.h"
#include "androidStudioProject.h"
#include "android.h"
#include "CBWinProject.h"
#include "visualStudioProject.h"
#include "VSCodeProject.h"
Expand Down Expand Up @@ -449,12 +448,9 @@ unique_ptr<baseProject> getTargetProject(const string & targ) {
targ == "linuxaarch64"
) {
return unique_ptr<VSCodeProject>(new VSCodeProject(targ));
}
else if (targ == "android") {
return unique_ptr<AndroidStudioProject>(new AndroidStudioProject(targ));
}
else if (targ == "android2024") {
return unique_ptr<android2024Project>(new android2024Project(targ));
else if (targ == "android") {
return unique_ptr<androidProject>(new androidProject(targ));
} else if (targ == "vscode") {
return unique_ptr<VSCodeProject>(new VSCodeProject(targ));
} else if (targ == "qtcreator") {
Expand Down