Skip to content

Produce .apk with correct name #17

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
Fatme merged 1 commit into from
Aug 5, 2014
Merged

Produce .apk with correct name #17

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 24 additions & 12 deletions lib/services/android-project-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import helpers = require("./../common/helpers");
import constants = require("./../constants");

class AndroidProjectService implements IPlatformProjectService {
private targetApi: string;

constructor(private $fs: IFileSystem,
private $errors: IErrors,
private $logger: ILogger,
Expand Down Expand Up @@ -42,13 +44,21 @@ class AndroidProjectService implements IPlatformProjectService {
}).future<any>()();
}

public interpolateData(projectRoot: string): void {
// Interpolate the activity name and package
var stringsFilePath = path.join(projectRoot, 'res', 'values', 'strings.xml');
shell.sed('-i', /__NAME__/, this.$projectData.projectName, stringsFilePath);
shell.sed('-i', /__TITLE_ACTIVITY__/, this.$projectData.projectName, stringsFilePath);
shell.sed('-i', /__NAME__/, this.$projectData.projectName, path.join(projectRoot, '.project'));
shell.sed('-i', /__PACKAGE__/, this.$projectData.projectId, path.join(projectRoot, "AndroidManifest.xml"));
public interpolateData(projectRoot: string): IFuture<void> {
return (() => {
// Interpolate the activity name and package
var manifestPath = path.join(projectRoot, "AndroidManifest.xml");
var safeActivityName = this.$projectData.projectName.replace(/\W/g, '');
shell.sed('-i', /__PACKAGE__/, this.$projectData.projectId, manifestPath);
shell.sed('-i', /__ACTIVITY__/, safeActivityName, manifestPath);
shell.sed('-i', /__APILEVEL__/, this.getTarget(projectRoot).wait().split('-')[1], manifestPath);

var stringsFilePath = path.join(projectRoot, 'res', 'values', 'strings.xml');
shell.sed('-i', /__NAME__/, this.$projectData.projectName, stringsFilePath);
shell.sed('-i', /__TITLE_ACTIVITY__/, this.$projectData.projectName, stringsFilePath);
shell.sed('-i', /__NAME__/, this.$projectData.projectName, path.join(projectRoot, '.project'));

}).future<void>()();
}

public afterCreateProject(projectRoot: string) {
Expand Down Expand Up @@ -152,14 +162,16 @@ class AndroidProjectService implements IPlatformProjectService {

private getTarget(projectRoot: string): IFuture<string> {
return (() => {
var projectPropertiesFilePath = path.join(projectRoot, "project.properties");
if(!this.targetApi) {
var projectPropertiesFilePath = path.join(projectRoot, "project.properties");

if (this.$fs.exists(projectPropertiesFilePath).wait()) {
var properties = this.$propertiesParser.createEditor(projectPropertiesFilePath).wait();
return properties.get("target");
if (this.$fs.exists(projectPropertiesFilePath).wait()) {
var properties = this.$propertiesParser.createEditor(projectPropertiesFilePath).wait();
this.targetApi = properties.get("target");
}
}

return "";
return this.targetApi;
}).future<string>()();
}

Expand Down