From c1776f6f2530ba8ee57cef5401eb458204a9039e Mon Sep 17 00:00:00 2001 From: osborn Date: Mon, 23 Dec 2019 17:29:42 +0800 Subject: [PATCH] Feature/update cli (#4) * fix js api typo * update doric-cli target file --- doric-cli/target/android/app/build.gradle | 4 ++-- doric-cli/target/android/build.gradle | 1 + doric-cli/target/iOS/Podfile | 2 +- doric-cli/target/js/$.ts | 4 ++-- doric-cli/target/js/_package.json | 2 +- doric-demo/src/FlowLayoutDemo.ts | 4 ++-- doric-demo/src/ListDemo.ts | 2 +- doric-demo/src/PopoverDemo.ts | 2 +- doric-demo/src/SliderDemo.ts | 2 +- doric-demo/src/StickDemo.ts | 4 ++-- doric-js/bundle/doric-lib.js | 2 +- doric-js/bundle/doric-vm.js | 2 +- doric-js/src/util/layoutconfig.ts | 2 +- 13 files changed, 17 insertions(+), 16 deletions(-) diff --git a/doric-cli/target/android/app/build.gradle b/doric-cli/target/android/app/build.gradle index c787c48a..7f5d2ffe 100644 --- a/doric-cli/target/android/app/build.gradle +++ b/doric-cli/target/android/app/build.gradle @@ -28,8 +28,8 @@ android { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.constraintlayout:constraintlayout:1.1.3' - implementation "pub.doric:core:0.1.2" - debugImplementation "pub.doric:core:0.1.2" + implementation "pub.doric:core:0.2.0" + debugImplementation "pub.doric:core:0.2.0" } } diff --git a/doric-cli/target/android/build.gradle b/doric-cli/target/android/build.gradle index 127eb65c..0eeaed64 100644 --- a/doric-cli/target/android/build.gradle +++ b/doric-cli/target/android/build.gradle @@ -21,6 +21,7 @@ allprojects { maven { url "https://dl.bintray.com/osborn/Android" } + maven { url 'https://jitpack.io' } } } diff --git a/doric-cli/target/iOS/Podfile b/doric-cli/target/iOS/Podfile index 48b7b7ee..fc61c792 100644 --- a/doric-cli/target/iOS/Podfile +++ b/doric-cli/target/iOS/Podfile @@ -6,5 +6,5 @@ target 'Example' do use_frameworks! # Pods for Example - pod 'Doric-framework' + pod 'DoricCore', '~>0.2.0' end diff --git a/doric-cli/target/js/$.ts b/doric-cli/target/js/$.ts index d4859cd7..84061784 100644 --- a/doric-cli/target/js/$.ts +++ b/doric-cli/target/js/$.ts @@ -21,13 +21,13 @@ class __$__ extends Panel { onClick: () => { number.text = `${++count}` }, - layoutConfig: layoutConfig().exactly(), + layoutConfig: layoutConfig().just(), width: 200, height: 50, }), ]) .apply({ - layoutConfig: layoutConfig().exactly().a(Gravity.Center), + layoutConfig: layoutConfig().just().configAlignment(Gravity.Center), width: 200, height: 200, space: 20, diff --git a/doric-cli/target/js/_package.json b/doric-cli/target/js/_package.json index 0b397ce8..a5cf88df 100644 --- a/doric-cli/target/js/_package.json +++ b/doric-cli/target/js/_package.json @@ -10,7 +10,7 @@ }, "license": "Apache-2.0", "dependencies": { - "doric": "0.1.3", + "doric": "0.2.0", "reflect-metadata": "^0.1.13", "rollup": "^1.27.14", "@rollup/plugin-commonjs": "^11.0.0", diff --git a/doric-demo/src/FlowLayoutDemo.ts b/doric-demo/src/FlowLayoutDemo.ts index 25b6415b..e6269e5b 100644 --- a/doric-demo/src/FlowLayoutDemo.ts +++ b/doric-demo/src/FlowLayoutDemo.ts @@ -31,7 +31,7 @@ class FlowDemo extends Panel { text: `${idx}`, textColor: Color.WHITE, textSize: 20, - layoutConfig: layoutConfig().fit().configAligmnet(Gravity.Center) + layoutConfig: layoutConfig().fit().configAlignmnet(Gravity.Center) })) }) }, @@ -51,7 +51,7 @@ class FlowDemo extends Panel { text: 'load more', textColor: Color.WHITE, textSize: 20, - layoutConfig: layoutConfig().fit().configAligmnet(Gravity.Center) + layoutConfig: layoutConfig().fit().configAlignmnet(Gravity.Center) })) }) }) diff --git a/doric-demo/src/ListDemo.ts b/doric-demo/src/ListDemo.ts index 71d4066c..6a26f012 100644 --- a/doric-demo/src/ListDemo.ts +++ b/doric-demo/src/ListDemo.ts @@ -33,7 +33,7 @@ class ListPanel extends Panel { } it.loadMoreView = listItem(text({ text: "Loading", - layoutConfig: layoutConfig().most().configHeight(LayoutSpec.JUST).configAligmnet(Gravity.Center), + layoutConfig: layoutConfig().most().configHeight(LayoutSpec.JUST).configAlignmnet(Gravity.Center), height: 50, })) it.renderItem = (idx: number) => { diff --git a/doric-demo/src/PopoverDemo.ts b/doric-demo/src/PopoverDemo.ts index 8782578b..af15a939 100644 --- a/doric-demo/src/PopoverDemo.ts +++ b/doric-demo/src/PopoverDemo.ts @@ -19,7 +19,7 @@ class PopoverDemo extends Panel { height: 50, backgroundColor: colors[0], textColor: Color.WHITE, - layoutConfig: layoutConfig().just().configAligmnet(Gravity.Center), + layoutConfig: layoutConfig().just().configAlignmnet(Gravity.Center), text: "This is PopOver Window", }).also(v => { let idx = 0 diff --git a/doric-demo/src/SliderDemo.ts b/doric-demo/src/SliderDemo.ts index 100ab458..848d0732 100644 --- a/doric-demo/src/SliderDemo.ts +++ b/doric-demo/src/SliderDemo.ts @@ -34,7 +34,7 @@ class SliderPanel extends Panel { return slideItem(image({ imageUrl: imageUrls[idx % imageUrls.length], scaleType: ScaleType.ScaleAspectFit, - layoutConfig: layoutConfig().configWidth(LayoutSpec.MOST).configHeight(LayoutSpec.MOST).configAligmnet(gravity().center()), + layoutConfig: layoutConfig().configWidth(LayoutSpec.MOST).configHeight(LayoutSpec.MOST).configAlignmnet(gravity().center()), })).also(it => { let start = idx it.onClick = () => { diff --git a/doric-demo/src/StickDemo.ts b/doric-demo/src/StickDemo.ts index 3fc1b14c..37a85aad 100644 --- a/doric-demo/src/StickDemo.ts +++ b/doric-demo/src/StickDemo.ts @@ -83,7 +83,7 @@ class StickDemo extends Panel { text: `In Page ${idx},${itemIdx}`, textColor: Color.WHITE, textSize: 20, - layoutConfig: layoutConfig().fit().configAligmnet(Gravity.Center) + layoutConfig: layoutConfig().fit().configAlignmnet(Gravity.Center) }).also(v => { v.onClick = () => { v.text = "Clicked" @@ -120,7 +120,7 @@ class StickDemo extends Panel { e.textColor = Color.BLACK } }) - this.indicator.layoutConfig = layoutConfig().just().configAligmnet(Gravity.Bottom).configMargin({ bottom: 13 }) + this.indicator.layoutConfig = layoutConfig().just().configAlignmnet(Gravity.Bottom).configMargin({ bottom: 13 }) animate(context)({ animations: () => { this.indicator.centerX = this.getRootView().width / this.tabs.length * (page + 0.5) diff --git a/doric-js/bundle/doric-lib.js b/doric-js/bundle/doric-lib.js index 9f70d008..e1f54658 100644 --- a/doric-js/bundle/doric-lib.js +++ b/doric-js/bundle/doric-lib.js @@ -556,7 +556,7 @@ class LayoutConfigImpl { this.margin = m; return this; } - configAligmnet(a) { + configAlignmnet(a) { this.alignment = a; return this; } diff --git a/doric-js/bundle/doric-vm.js b/doric-js/bundle/doric-vm.js index b5a93fa9..bd8a4450 100644 --- a/doric-js/bundle/doric-vm.js +++ b/doric-js/bundle/doric-vm.js @@ -2004,7 +2004,7 @@ class LayoutConfigImpl { this.margin = m; return this; } - configAligmnet(a) { + configAlignmnet(a) { this.alignment = a; return this; } diff --git a/doric-js/src/util/layoutconfig.ts b/doric-js/src/util/layoutconfig.ts index 9576bb9a..471fb9ff 100644 --- a/doric-js/src/util/layoutconfig.ts +++ b/doric-js/src/util/layoutconfig.ts @@ -96,7 +96,7 @@ export class LayoutConfigImpl implements LayoutConfig, Modeling { return this } - configAligmnet(a: Gravity) { + configAlignmnet(a: Gravity) { this.alignment = a return this }