Skip to content

Commit

Permalink
chore: android x typings
Browse files Browse the repository at this point in the history
  • Loading branch information
farfromrefug committed Jun 16, 2019
1 parent 0df7dba commit 89c4797
Show file tree
Hide file tree
Showing 5 changed files with 31,072 additions and 981 deletions.
9 changes: 3 additions & 6 deletions demo-vue/package.json
Expand Up @@ -5,11 +5,8 @@
"repository": "http://www.github.com/NativeScript/nativescript-ui-sidedrawer.git",
"nativescript": {
"id": "org.nativescript.demovuematerial",
"tns-ios": {
"version": "5.2.0"
},
"tns-android": {
"version": "5.3.1"
"version": "6.0.0-2019-06-12-140945-01"
}
},
"dependencies": {
Expand All @@ -26,7 +23,7 @@
"nativescript-material-textfield": "../packages/nativescript-material-textfield",
"nativescript-theme-core": "~1.0.4",
"akylas-nativescript-vue": "~2.1.14",
"tns-core-modules": "^5.4.0-androidx-2019-03-22-160602-06",
"tns-core-modules": "androidx",
"tslib": "^1.9.3",
"vue-class-component": "^7.0.2"
},
Expand All @@ -43,7 +40,7 @@
"akylas-nativescript-vue-template-compiler": "~2.1.14",
"node-sass": "^4.12.0",
"shelljs": "^0.8.3",
"tns-platform-declarations": "^5.4.0-androidx-2019-03-22-160602-06",
"tns-platform-declarations": "androidx",
"vue": "~2.6.10",
"vue-class-component": "~7.0.2",
"vue-loader": "~15.7.0",
Expand Down
4 changes: 2 additions & 2 deletions package.json
Expand Up @@ -60,8 +60,8 @@
"prompt": "^1.0.0",
"rimraf": "^2.6.3",
"rxjs": "^6.5.1",
"tns-core-modules": "5.4.0-androidx-2019-03-22-160602-06",
"tns-platform-declarations": "5.4.0-androidx-2019-03-22-160602-06",
"tns-core-modules": "androidx",
"tns-platform-declarations": "androidx",
"tslint": "^5.16.0",
"tslint-config-prettier": "^1.18.0",
"tslint-config-standard": "^8.0.1",
Expand Down
2 changes: 1 addition & 1 deletion references.d.ts
@@ -1,2 +1,2 @@
/// <reference path="./node_modules/tns-platform-declarations/ios.d.ts" />
/// <reference path="./node_modules/tns-platform-declarations/android-26.d.ts" />
/// <reference path="./node_modules/tns-platform-declarations/android-28.d.ts" />
4 changes: 2 additions & 2 deletions src/textfield/textfield.android.ts
Expand Up @@ -75,7 +75,7 @@ export class TextField extends TextFieldBase {
}

public createNativeView() {
let layoutIdName = 'material_text_field';
let layoutIdName = 'material _text_field';
if (this.style['variant'] === 'filled') {
layoutIdName = 'material_text_field_filled';
} else if (this.style['variant'] === 'outline') {
Expand All @@ -88,7 +88,7 @@ export class TextField extends TextFieldBase {

initTextInputEditText();
if (layoutId !== 0) {
layout = this.layoutView = android.view.LayoutInflater.from(this._context).inflate(layoutId, null, false) ascom.google.android.material.textfield.TextInputLayout;
layout = this.layoutView = android.view.LayoutInflater.from(this._context).inflate(layoutId, null, false) as com.google.android.material.textfield.TextInputLayout;
editText = this.editText = (layout.getChildAt(0) as android.widget.FrameLayout).getChildAt(0) as TextInputEditText;
} else {
layout = this.layoutView = new com.google.android.material.textfield.TextInputLayout(this._context);
Expand Down

0 comments on commit 89c4797

Please sign in to comment.