diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index dde32343..00000000 Binary files a/favicon.ico and /dev/null differ diff --git a/index-phone-preview.html b/index-phone-preview.html index deeac7e6..e64a7da2 100644 --- a/index-phone-preview.html +++ b/index-phone-preview.html @@ -5,6 +5,7 @@ Mendix - Phone preview {{themecss}} + {{appicons}} diff --git a/index-rtl.html b/index-rtl.html index e5300442..4b740630 100644 --- a/index-rtl.html +++ b/index-rtl.html @@ -8,6 +8,7 @@ {{themecss}} + {{appicons}} diff --git a/index-tablet-preview.html b/index-tablet-preview.html index 196a0ac0..a311e25c 100644 --- a/index-tablet-preview.html +++ b/index-tablet-preview.html @@ -5,6 +5,7 @@ Mendix - Tablet preview {{themecss}} + {{appicons}} diff --git a/index.html b/index.html index e65839ac..8244e25a 100644 --- a/index.html +++ b/index.html @@ -8,11 +8,7 @@ {{themecss}} - - - - - + {{appicons}} @@ -29,7 +25,7 @@ diff --git a/package.json b/package.json index 0a0594f6..5ea8b05b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "atlas-ui-framework", - "version": "2.5.7", + "version": "2.6.0", "description": "Mendix Atlas UI is the foundation of making beautiful apps with Mendix. For more information about the framework go to https://atlas.mendix.com.", "main": "", "scripts": { diff --git a/scripts/lib/writeFile.js b/scripts/lib/writeFile.js index e647bf9a..fb357798 100644 --- a/scripts/lib/writeFile.js +++ b/scripts/lib/writeFile.js @@ -3,5 +3,6 @@ const fs = require("fs"); module.exports.writeVersionFiles = (files, paths) => { fs.writeFileSync(paths.pkg, JSON.stringify(files.pkg, null, 4)); fs.writeFileSync(paths.manifest.js, JSON.stringify(files.manifest.js, null, 4)); + fs.writeFileSync(paths.manifest.ts, JSON.stringify(files.manifest.ts, null, 4)); fs.writeFileSync(paths.manifest.sass, JSON.stringify(files.manifest.sass, null, 4)); }; diff --git a/styles/native/js/core/manifest.json b/styles/native/js/core/manifest.json index 092e3a8b..816bfe8e 100644 --- a/styles/native/js/core/manifest.json +++ b/styles/native/js/core/manifest.json @@ -1,4 +1,4 @@ { "name": "Atlas-UI-Framework", - "version": "2.5.7" -} + "version": "2.6.0" +} \ No newline at end of file diff --git a/styles/native/js/core/widgets/bottomsheet.js b/styles/native/js/core/widgets/bottomsheet.js index 2046eed3..167ee4d5 100644 --- a/styles/native/js/core/widgets/bottomsheet.js +++ b/styles/native/js/core/widgets/bottomsheet.js @@ -1,4 +1,4 @@ -import { background, border } from "../variables"; +import { background, border, brand, contrast, font } from "../variables"; // // DISCLAIMER: // Do not change this file because it is core styling. @@ -31,28 +31,37 @@ export const com_mendix_widget_native_bottomsheet_BottomSheet = { backgroundColor: background.primary, }, modal: { - // All ViewStyle properties are allowed + // All ViewStyle properties are allowed + margin: 0, + justifyContent: "flex-end", }, modalItems: { + container: { + // rippleColor & All TextStyle properties are allowed + height: 50, + marginTop: 0, + rippleColor: contrast.lower, + backgroundColor: background.primary, + }, defaultStyle: { // All TextStyle properties are allowed fontSize: 16, - color: "black", + color: font.color, }, primaryStyle: { // All TextStyle properties are allowed fontSize: 16, - color: "#0595DB", + color: brand.primary, }, dangerStyle: { // All TextStyle properties are allowed fontSize: 16, - color: "#ed1c24", + color: brand.danger, }, customStyle: { // All TextStyle properties are allowed fontSize: 16, - color: "#76CA02", + color: font.color, }, }, }; diff --git a/styles/native/js/core/widgets/popupmenu.js b/styles/native/js/core/widgets/popupmenu.js index 74446112..826bd1f4 100644 --- a/styles/native/js/core/widgets/popupmenu.js +++ b/styles/native/js/core/widgets/popupmenu.js @@ -16,17 +16,28 @@ export const com_mendix_widget_native_popupmenu_PopupMenu = { // All ViewStyle properties are allowed borderRadius: 10, shadowColor: "#000", - overflow: "hidden", shadowOpacity: 0.2, shadowRadius: 10, elevation: 16, backgroundColor: background.primary, }, - itemRippleColor: contrast.lower, + custom: { + container: { + // All ViewStyle properties are allowed + }, + itemStyle: { + rippleColor: contrast.lower, + }, + }, basic: { dividerColor: font.color, + container: { + // All ViewStyle properties are allowed + height: 40, + }, itemStyle: { ellipsizeMode: "tail", + rippleColor: contrast.lower, defaultStyle: { // All TextStyle properties are allowed color: font.color, @@ -43,9 +54,5 @@ export const com_mendix_widget_native_popupmenu_PopupMenu = { // All TextStyle properties are allowed }, }, - containerStyle: { - // All ViewStyle properties are allowed - height: 40, - }, }, }; diff --git a/styles/native/ts/core/manifest.json b/styles/native/ts/core/manifest.json index 092e3a8b..a38fc4ab 100644 --- a/styles/native/ts/core/manifest.json +++ b/styles/native/ts/core/manifest.json @@ -1,4 +1,4 @@ { "name": "Atlas-UI-Framework", - "version": "2.5.7" + "version": "2.6.0" } diff --git a/styles/native/ts/core/widgets/bottomsheet.ts b/styles/native/ts/core/widgets/bottomsheet.ts index ceed7363..8a2af346 100644 --- a/styles/native/ts/core/widgets/bottomsheet.ts +++ b/styles/native/ts/core/widgets/bottomsheet.ts @@ -1,5 +1,5 @@ -import { background, border } from "../variables"; -import { BottomSheetType } from "../../types/widgets"; +import { background, border, brand, contrast, font } from "../variables"; +import { BottomSheetType } from "../../types/widgets"; // // DISCLAIMER: @@ -37,27 +37,36 @@ export const com_mendix_widget_native_bottomsheet_BottomSheet: BottomSheetType = }, modal: { // All ViewStyle properties are allowed + margin: 0, + justifyContent: "flex-end", }, modalItems: { + container: { + // rippleColor & All TextStyle properties are allowed + height: 50, + marginTop: 0, + rippleColor: contrast.lower, + backgroundColor: background.primary, + }, defaultStyle: { // All TextStyle properties are allowed fontSize: 16, - color: "black", + color: font.color, }, primaryStyle: { // All TextStyle properties are allowed fontSize: 16, - color: "#0595DB", + color: brand.primary, }, dangerStyle: { // All TextStyle properties are allowed fontSize: 16, - color: "#ed1c24", + color: brand.danger, }, customStyle: { // All TextStyle properties are allowed fontSize: 16, - color: "#76CA02", + color: font.color, }, }, }; diff --git a/styles/native/ts/core/widgets/popupmenu.ts b/styles/native/ts/core/widgets/popupmenu.ts index 658a4efa..c28e4bfd 100644 --- a/styles/native/ts/core/widgets/popupmenu.ts +++ b/styles/native/ts/core/widgets/popupmenu.ts @@ -17,17 +17,28 @@ export const com_mendix_widget_native_popupmenu_PopupMenu: PopupMenuType = { // All ViewStyle properties are allowed borderRadius: 10, shadowColor: "#000", - overflow: "hidden", shadowOpacity: 0.2, shadowRadius: 10, elevation: 16, backgroundColor: background.primary, }, - itemRippleColor: contrast.lower, + custom: { + container: { + // All ViewStyle properties are allowed + }, + itemStyle: { + rippleColor: contrast.lower, + }, + }, basic: { dividerColor: font.color, + container: { + // All ViewStyle properties are allowed + height: 40, + }, itemStyle: { ellipsizeMode: "tail", // 'head' | 'middle' | 'tail' | 'clip'; + rippleColor: contrast.lower, defaultStyle: { // All TextStyle properties are allowed color: font.color, @@ -44,9 +55,5 @@ export const com_mendix_widget_native_popupmenu_PopupMenu: PopupMenuType = { // All TextStyle properties are allowed }, }, - containerStyle: { - // All ViewStyle properties are allowed - height: 40, - }, }, }; diff --git a/styles/native/ts/types/widgets.d.ts b/styles/native/ts/types/widgets.d.ts index 80657e0a..d51181b3 100644 --- a/styles/native/ts/types/widgets.d.ts +++ b/styles/native/ts/types/widgets.d.ts @@ -1,4 +1,4 @@ -import { ImageStyle, TextStyle, ViewStyle, TextProps } from "react-native"; +import { ImageStyle, TextProps, TextStyle, ViewStyle } from "react-native"; declare type ActivityIndicatorSizeType = "small" | "large"; @@ -47,6 +47,9 @@ export interface BottomSheetType { containerWhenExpandedFullscreen?: ViewStyle, modal?: ViewStyle, modalItems?: { + container?: ViewStyle & { + rippleColor?: string; + } defaultStyle?: TextStyle; primaryStyle?: TextStyle; dangerStyle?: TextStyle; @@ -151,14 +154,14 @@ export interface DropDownType { container?: ViewStyle, label?: InputLabelType, value?: { - placeholderTextColor?: string - } & TextStyle, + placeholderTextColor?: string + } & TextStyle, valueDisabled?: TextStyle, validationMessage?: TextStyle, /* New dropdown styles start */ valueContainer?: { - rippleColor?: string - } & ViewStyle; + rippleColor?: string + } & ViewStyle; menuWrapper?: ViewStyle item?: TextStyle; itemContainer?: ViewStyle; @@ -332,16 +335,23 @@ export interface ProgressCircleType { export interface PopupMenuType { container?: ViewStyle; basic: BasicItemStyle; + custom: CustomItemStyle buttonContainer?: ViewStyle; - itemRippleColor: string; +} + +interface CustomItemStyle extends ViewStyle { + container?: ViewStyle; + itemStyle: { rippleColor?: string }; } interface BasicItemStyle { itemStyle?: ItemStyle; - containerStyle?: ViewStyle; + container?: ViewStyle; dividerColor?: string; } + interface ItemStyle { + rippleColor?: string; ellipsizeMode?: TextProps["ellipsizeMode"]; defaultStyle?: TextStyle; primaryStyle?: TextStyle; @@ -349,7 +359,6 @@ interface ItemStyle { customStyle?: TextStyle; } - // QR Code export interface QRCodeType { container?: ViewStyle, diff --git a/styles/web/sass/core/manifest.json b/styles/web/sass/core/manifest.json index cc72f27b..816bfe8e 100644 --- a/styles/web/sass/core/manifest.json +++ b/styles/web/sass/core/manifest.json @@ -1,4 +1,4 @@ { "name": "Atlas-UI-Framework", - "version": "2.5.7" + "version": "2.6.0" } \ No newline at end of file