Skip to content

Commit 9da0014

Browse files
authored
Merge pull request #17 from triniwiz/master
{N} 2.4 Fixes
2 parents 6544165 + ac8b168 commit 9da0014

File tree

81 files changed

+520
-107
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+520
-107
lines changed

app/App_Resources/iOS/Info.plist

Lines changed: 0 additions & 47 deletions
This file was deleted.

checkbox.android.ts

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { CheckBoxInterface } from "./checkbox";
1+
import { CheckBoxInterface } from "./";
22
import { View } from "ui/core/view";
33
import { Color } from "color";
44
import { isAndroid, device } from "platform";
@@ -198,16 +198,11 @@ export class CheckBoxStyler implements style.Styler {
198198
CheckBoxStyler.setFontInternalProperty,
199199
CheckBoxStyler.resetFontInternalProperty,
200200
CheckBoxStyler.getNativeFontInternalValue), "CheckBox");
201-
/*
201+
202202
style.registerHandler(style.backgroundColorProperty, new style.StylePropertyChangedHandler(
203203
CheckBoxStyler.setColorLabelProperty,
204204
CheckBoxStyler.resetColorProperty), "CheckBox");
205-
*/
206-
207-
style.registerHandler(style.borderWidthProperty, style.ignorePropertyHandler, "CheckBox");
208-
style.registerHandler(style.borderColorProperty, style.ignorePropertyHandler, "CheckBox");
209-
style.registerHandler(style.borderRadiusProperty, style.ignorePropertyHandler, "CheckBox");
210205
}
211206
}
212207

213-
CheckBoxStyler.registerHandlers();
208+
CheckBoxStyler.registerHandlers();

checkbox.ios.ts

Lines changed: 1 addition & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/// <reference path="BEMCheckBox.d.ts" /> Needed for autocompletion and compilation.
22

3-
import {CheckBoxInterface} from "./checkbox";
3+
import {CheckBoxInterface} from "./";
44
import { View } from "ui/core/view";
55
import {ContentView} from "ui/content-view";
66
import { Property, PropertyChangeData } from "ui/core/dependency-observable";
@@ -270,35 +270,3 @@ class BEMCheckBoxDelegateImpl extends NSObject implements BEMCheckBoxDelegate {
270270
}
271271
}
272272
}
273-
274-
export class CheckBoxStyler implements style.Styler {
275-
private static setBorderColorProperty(view: any, newValue: any) {
276-
if (view.nativeiOSCheckBox){
277-
try{
278-
var color = new Color(newValue);
279-
view.nativeiOSCheckBox.tintColor = color.ios;
280-
}catch(error){
281-
//Do nothing, catch bad color value
282-
}
283-
}
284-
}
285-
286-
private static setBorderWidthProperty(view: any, newValue: any) {
287-
if (view.nativeiOSCheckBox){
288-
view.nativeiOSCheckBox.lineWidth = newValue;
289-
}
290-
}
291-
292-
private static resetColorProperty(view: View, nativeValue: number) {
293-
// Do nothing.
294-
}
295-
296-
public static registerHandlers() {
297-
style.registerHandler(style.borderColorProperty, new style.StylePropertyChangedHandler(CheckBoxStyler.setBorderColorProperty, CheckBoxStyler.resetColorProperty), "CheckBox");
298-
style.registerHandler(style.borderWidthProperty, new style.StylePropertyChangedHandler(CheckBoxStyler.setBorderWidthProperty, CheckBoxStyler.resetColorProperty), "CheckBox");
299-
300-
style.registerHandler(style.borderRadiusProperty, style.ignorePropertyHandler, "CheckBox");
301-
}
302-
}
303-
304-
CheckBoxStyler.registerHandlers();

demo/app/App_Resources/Android/AndroidManifest.xml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,18 @@
2323
android:allowBackup="true"
2424
android:icon="@drawable/icon"
2525
android:label="@string/app_name"
26-
android:theme="@style/AppTheme" >
26+
android:theme="@style/AppTheme">
27+
2728
<activity
2829
android:name="com.tns.NativeScriptActivity"
2930
android:label="@string/title_activity_kimera"
30-
android:configChanges="keyboardHidden|orientation|screenSize">
31+
android:configChanges="keyboardHidden|orientation|screenSize"
32+
android:theme="@style/LaunchScreenTheme">
3133

32-
<intent-filter>
33-
<action android:name="android.intent.action.MAIN" />
34+
<meta-data android:name="SET_THEME_ON_LAUNCH" android:resource="@style/AppTheme" />
3435

36+
<intent-filter>
37+
<action android:name="android.intent.action.MAIN" />
3538
<category android:name="android.intent.category.LAUNCHER" />
3639
</intent-filter>
3740
</activity>

demo/app/App_Resources/Android/app.gradle

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,21 @@
33
// Uncomment to add recyclerview-v7 dependency
44
//dependencies {
55
// compile 'com.android.support:recyclerview-v7:+'
6-
//}
6+
//}
7+
8+
android {
9+
defaultConfig {
10+
generatedDensities = []
11+
applicationId = "__PACKAGE__"
12+
13+
//override supported platforms
14+
// ndk {
15+
// abiFilters.clear()
16+
// abiFilters "armeabi-v7a"
17+
// }
18+
19+
}
20+
aaptOptions {
21+
additionalParameters "--no-version-vectors"
22+
}
23+
}
3.42 KB

demo/app/App_Resources/Android/drawable-hdpi/icon.png

100644100755
File mode changed.
32.4 KB
1.31 KB

demo/app/App_Resources/Android/drawable-ldpi/icon.png

100644100755
File mode changed.

0 commit comments

Comments
 (0)