Skip to content

Commit

Permalink
Merge pull request #1 from NativeScript/plamen5kov/app_update
Browse files Browse the repository at this point in the history
Plamen5kov/app update
  • Loading branch information
petekanev committed May 9, 2016
2 parents dde18bd + fd54815 commit 402a865
Show file tree
Hide file tree
Showing 125 changed files with 42 additions and 29,558 deletions.
14 changes: 2 additions & 12 deletions .gitignore
@@ -1,12 +1,2 @@
*.class

# Mobile Tools for Java (J2ME)
.mtj.tmp/

# Package Files #
*.jar
*.war
*.ear

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
node_modules/
platforms/
12 changes: 10 additions & 2 deletions app/App_Resources/Android/app.gradle
Expand Up @@ -11,5 +11,13 @@ android {
}
aaptOptions {
additionalParameters "--no-version-vectors"
}
}
}

defaultConfig {
multiDexEnabled true
}
}

dependencies {
compile "com.android.support:multidex:1.0.0"
}
18 changes: 8 additions & 10 deletions app/MultiDexApp.js
@@ -1,10 +1,8 @@
(function(){
android.app.Application.extend("com.tns.NativeScriptMultiDexApp", {
onCreate: function() {
},
attachBaseContext: function(base) {
this.super.attachBaseContext(base);
android.support.multidex.MultiDex.install(this.super);
}
});
})();
android.app.Application.extend("com.tns.NativeScriptMultiDexApp", {
onCreate: function() {
},
attachBaseContext: function(base) {
this.super.attachBaseContext(base);
android.support.multidex.MultiDex.install(this.super);
}
});
44 changes: 21 additions & 23 deletions app/MyActivity.js
@@ -1,25 +1,23 @@
(function () {
android.app.Activity.extend("com.tns.MyActivity", {
MyActivity: function () {
com.tns.Runtime.initInstance(this);
},
onCreate: function (bundle) {
this.super.onCreate(bundle);
android.util.Log.d("-----", "It works");
android.app.Activity.extend("com.tns.MyActivity", {
MyActivity: function () {
com.tns.Runtime.initInstance(this);
},
onCreate: function (bundle) {
this.super.onCreate(bundle);
android.util.Log.d("-----", "It works");

var layout = new android.widget.LinearLayout(this);
layout.setOrientation(1);
this.setContentView(layout);
var layout = new android.widget.LinearLayout(this);
layout.setOrientation(1);
this.setContentView(layout);

var textView = new android.widget.TextView(this);
textView.setText("Hello!");

textView.setGravity(android.view.Gravity.CENTER);
textView.setTextSize(50);

layout.addView(textView);

com.tns.RedundantClassNameWithTooManyMethods.Method10001();
}
});
})();
var textView = new android.widget.TextView(this);
textView.setText("Hello!");

textView.setGravity(android.view.Gravity.CENTER);
textView.setTextSize(50);

layout.addView(textView);

com.tns.RedundantClassNameWithTooManyMethods.Method10001();
}
});
2 changes: 0 additions & 2 deletions app/app.js
@@ -1,3 +1 @@
// var application = require("application");
// application.start({ moduleName: "main-page" });
android.util.Log.d("-------------","Hi!")
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -10,7 +10,7 @@
"devDependencies": {
"babel-traverse": "6.8.0",
"babel-types": "6.8.1",
"babylon": "6.7.0",
"babylon": "6.8.0",
"filewalker": "0.1.2",
"lazy": "1.0.11"
}
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

0 comments on commit 402a865

Please sign in to comment.