javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-16 03:31:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Segmenter bar thickness

Browse Source
This commit is contained in:
vakrilov
2017-03-14 13:58:44 +02:00
parent 9a051f8373
commit a824224cca
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tns-core-modules/ui/segmented-bar/segmented-bar.android.ts
View File

@ -1,7 +1,7 @@
import { Font } from "../styling/font"; import { Font } from "../styling/font";
import { import {
SegmentedBarItemBase, SegmentedBarBase, selectedIndexProperty, itemsProperty, selectedBackgroundColorProperty, SegmentedBarItemBase, SegmentedBarBase, selectedIndexProperty, itemsProperty, selectedBackgroundColorProperty,
colorProperty, fontInternalProperty, fontSizeProperty, Color, initNativeView colorProperty, fontInternalProperty, fontSizeProperty, Color, initNativeView, layout
} from "./segmented-bar-common"; } from "./segmented-bar-common";
export * from "./segmented-bar-common"; export * from "./segmented-bar-common";
@ -24,6 +24,7 @@ interface TabHost {
} }
let apiLevel: number; let apiLevel: number;
let selectedIndicatorThickness: number;
let TabHost: TabHost; let TabHost: TabHost;
let TabChangeListener: TabChangeListener; let TabChangeListener: TabChangeListener;
@ -34,6 +35,10 @@ function initializeNativeClasses(): void {
return; return;
} }
apiLevel = android.os.Build.VERSION.SDK_INT;
// Indicator thickness for material - 2dip. For pre-material - 5dip.
selectedIndicatorThickness = layout.toDevicePixels(apiLevel >= 21 ? 2 : 5);
@Interfaces([android.widget.TabHost.OnTabChangeListener]) @Interfaces([android.widget.TabHost.OnTabChangeListener])
class TabChangeListenerImpl extends java.lang.Object implements android.widget.TabHost.OnTabChangeListener { class TabChangeListenerImpl extends java.lang.Object implements android.widget.TabHost.OnTabChangeListener {
constructor(private owner: SegmentedBar) { constructor(private owner: SegmentedBar) {
@ -163,10 +168,9 @@ export class SegmentedBarItem extends SegmentedBarItemBase {
org.nativescript.widgets.ViewHelper.setBackground(viewGroup, newDrawable); org.nativescript.widgets.ViewHelper.setBackground(viewGroup, newDrawable);
} else { } else {
const stateDrawable = new android.graphics.drawable.StateListDrawable(); const stateDrawable = new android.graphics.drawable.StateListDrawable();
let colorDrawable: android.graphics.drawable.ColorDrawable = new org.nativescript.widgets.SegmentedBarColorDrawable(color, selectedIndicatorThickness);
let arr = Array.create("int", 1); let arr = Array.create("int", 1);
arr[0] = R_ATTR_STATE_SELECTED; arr[0] = R_ATTR_STATE_SELECTED;
let colorDrawable: android.graphics.drawable.ColorDrawable = new org.nativescript.widgets.SegmentedBarColorDrawable(color);
stateDrawable.addState(arr, colorDrawable); stateDrawable.addState(arr, colorDrawable);
stateDrawable.setBounds(0, 15, viewGroup.getRight(), viewGroup.getBottom()); stateDrawable.setBounds(0, 15, viewGroup.getRight(), viewGroup.getBottom());

1
tns-platform-declarations/android/org.nativescript.widgets.d.ts vendored
View File

@ -498,6 +498,7 @@
} }
export class SegmentedBarColorDrawable extends android.graphics.drawable.ColorDrawable { export class SegmentedBarColorDrawable extends android.graphics.drawable.ColorDrawable {
constructor(color: number, thickness: number);
} }
export class CustomTypefaceSpan extends android.text.style.TypefaceSpan { export class CustomTypefaceSpan extends android.text.style.TypefaceSpan {