javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-11-05 13:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Release to master (#8382)

Browse Source 
* fix the crash

* chore: update MaterialComponents pod (#8176)

* chore: update MaterialComponents pod

* chore: remove copy of pod file in build script

* chore: cut the 6.3.0 release (#8174)

* hore: cut the 6.3.1 release

* fix: handle fake attach after FragMgr is destroyed (#8200)

* fix: check is disposed fragment is in the FragmentManager (#8201)

* release: cut the 6.3.2 release

* release: cut the 6.4.0 release

* chore(build): always use local typescript

* fix: flipLeft and flipRight on Android (#8307)

* fix(android): tap-trip-item title disappearing

* fix(andoid): crash when setting font on tab-item with no image

* fix(build): Add platforms/android to NPM package (#8312)

Co-authored-by: Dimitar Topuzov <dtopuzov@gmail.com>
Co-authored-by: Alexander Vakrilov <alexander.vakrilov@gmail.com>

* release: cut the 6.4.1 release

* chore: bump tns-core-modules-widgets version (#8352)

Co-authored-by: hamidbsd <50081218+hamidbsd@users.noreply.github.com>
Co-authored-by: Alexander Vakrilov <alexander.vakrilov@gmail.com>
Co-authored-by: Dimitar Topuzov <dtopuzov@gmail.com>
Co-authored-by: Nick Iliev <nikolay.iliev@telerik.com>
Co-authored-by: Martin Bektchiev <martin.bektchiev@progress.com>
Co-authored-by: Rosen Vladimirov <rosen-vladimirov@users.noreply.github.com>
This commit is contained in:
Vasil Trifonov
2020-02-26 18:06:50 +02:00
committed by GitHub
parent 8b7a968d2f
commit 2d4e258a88
11 changed files with 95 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
nativescript-core/ui/bottom-navigation/bottom-navigation.android.ts
View File

@@ -391,7 +391,7 @@ export class BottomNavigation extends TabNavigationBase {
if (this._manager && this._manager.isDestroyed()) {
return;
}
this._attachedToWindow = true;
this.changeTab(this.selectedIndex);
}
@@ -614,6 +614,9 @@ export class BottomNavigation extends TabNavigationBase {
private getIcon(tabStripItem: TabStripItem): android.graphics.drawable.BitmapDrawable {
const iconSource = tabStripItem.image && tabStripItem.image.src;
if (!iconSource) {
return null;
}
let is: ImageSource;
if (isFontIconURI(iconSource)) {
@@ -705,7 +708,10 @@ export class BottomNavigation extends TabNavigationBase {
}
public setTabBarItemFontInternal(tabStripItem: TabStripItem, value: Font): void {
tabStripItem.nativeViewProtected.setTextSize(value.fontSize);
if (value.fontSize) {
tabStripItem.nativeViewProtected.setTextSize(value.fontSize);
}
tabStripItem.nativeViewProtected.setTypeface(value.getAndroidTypeface());
}