test: demo app update

farfromrefug · farfromrefug · commit 50c2a8ad7421 · 2020-10-10T20:34:46.000+02:00
diff --git a/demo-vue/app/App_Resources/Android/before-plugins.gradle b/demo-vue/app/App_Resources/Android/before-plugins.gradle
@@ -1,3 +1,4 @@
 ext {
-    androidXMaterial = "1.2.0"
+    androidXMaterial = "1.2.1"
+    androidXMaterial = "1.2.1"
 }
diff --git a/demo-vue/app/App_Resources/Android/src/main/AndroidManifest.xml b/demo-vue/app/App_Resources/Android/src/main/AndroidManifest.xml
@@ -21,14 +21,14 @@
 	<application
 		android:name="com.tns.NativeScriptApplication"
 		android:allowBackup="true"
+		android:supportsRtl="true"
 		android:icon="@drawable/icon"
 		android:label="@string/app_name"
 		android:theme="@style/AppTheme">
 
 		<activity
 			android:name="com.tns.NativeScriptActivity"
 			android:label="@string/title_activity_kimera"
-			android:configChanges="keyboardHidden|orientation|screenSize"
 			android:theme="@style/LaunchScreenTheme">
 
 			<meta-data android:name="SET_THEME_ON_LAUNCH" android:resource="@style/AppTheme" />
diff --git a/demo-vue/app/App_Resources/Android/src/main/res/values-v21/styles.xml b/demo-vue/app/App_Resources/Android/src/main/res/values-v21/styles.xml
@@ -8,12 +8,12 @@
     </style>
 
     <!-- Default style for DatePicker - in spinner mode -->
-    <style name="SpinnerDatePicker" parent="android:Widget.Material.Light.DatePicker">
+    <style name="SpinnerDatePicker" parent="android:Widget.Material.DatePicker">
         <item name="android:datePickerMode">spinner</item>
     </style>
 
     <!-- Default style for TimePicker - in spinner mode -->
-    <style name="SpinnerTimePicker" parent="android:Widget.Material.Light.TimePicker">
+    <style name="SpinnerTimePicker" parent="android:Widget.Material.TimePicker">
         <item name="android:timePickerMode">spinner</item>
     </style>
 
diff --git a/demo-vue/app/App_Resources/Android/src/main/res/values/styles.xml b/demo-vue/app/App_Resources/Android/src/main/res/values/styles.xml
@@ -3,7 +3,6 @@
 
     <!-- theme to use FOR launch screen-->
     <style name="LaunchScreenThemeBase" parent="Theme.MaterialComponents.DayNight.NoActionBar">
-        <item name="toolbarStyle">@style/NativeScriptToolbarStyle</item>
 
         <item name="colorPrimary">@color/ns_primary</item>
         <item name="colorSecondary">@color/ns_primary</item>
@@ -25,7 +24,6 @@
         <item name="toolbarStyle">@style/NativeScriptToolbarStyle</item>
 
         <item name="colorPrimary">@color/ns_primary</item>
-        <item name="colorSecondary">@color/ns_primary</item>
         <item name="colorPrimaryDark">@color/ns_primaryDark</item>
         <item name="colorAccent">@color/ns_accent</item>
 
@@ -37,8 +35,8 @@
     <!-- theme for action-bar -->
     <style name="NativeScriptToolbarStyleBase" parent="Widget.AppCompat.Toolbar">
         <item name="android:background">@color/ns_primary</item>
-        <item name="theme">@style/ThemeOverlay.AppCompat.ActionBar</item>
-        <item name="popupTheme">@style/ThemeOverlay.AppCompat</item>
+        <item name="theme">@style/ThemeOverlay.MaterialComponents.ActionBar</item>
+        <item name="popupTheme">@style/ThemeOverlay.MaterialComponents</item>
 
     </style>
 
diff --git a/demo-vue/app/app.scss b/demo-vue/app/app.scss
@@ -5,6 +5,9 @@ button {
     elevation: 2;
 }
 
+// page {
+//     background-color: black;
+// }
 
 .falseFAb {
     elevation: 2;
diff --git a/demo-vue/app/examples/Buttons.vue b/demo-vue/app/examples/Buttons.vue
@@ -21,7 +21,7 @@
                 <MDFloatingActionButton src="res://ic_action_add" @tap="onTap" horizontalAlignment="center" />
                 <MDFloatingActionButton id="fab" src="res://ic_action_add" color="white" backgroundColor="blue" size="mini" @tap="onTap" horizontalAlignment="center" />
                 <MDFloatingActionButton src="res://ic_action_add" text="test expanded" @tap="onTap" horizontalAlignment="center" />
-                <MDFloatingActionButton src="res://ic_action_add" text="test expanded" :expanded="expanded" @tap="expanded = !expanded" horizontalAlignment="center" />
+                <MDFloatingActionButton src="res://ic_action_add" text="test expanded" :expanded="expanded" @tap="switchExpanded" horizontalAlignment="center" />
                 <StackLayout margin="10">
                     <MDButton id="button0" text="default button" @tap="onTap" />
                 </StackLayout>
@@ -101,6 +101,10 @@ export default Vue.extend({
         },
         onTap() {
             console.log('Button tapped');
+        },
+        switchExpanded() {
+            console.log('switchExpanded');
+            this.expanded = !this.expanded
         }
     }
 });
diff --git a/demo-vue/app/examples/TextView.vue b/demo-vue/app/examples/TextView.vue
@@ -27,7 +27,7 @@
                     </FormattedString>
                 </MDTextView>
                 <MDTextView id="textView2" editable="false" counterMaxLength="10" maxLength="10" hint="hint me" @textChange="onTextChange" @returnPress="onReturnPress" />
-                <MDTextView id="textView3" variant="outline" hint="outline" @textChange="onTextChange" v-model="value" @returnPress="onReturnPress" />
+                <MDTextView id="textView3" placeholderColor="green" floatingColor="yellow" color="red" variant="outline" hint="text should be red" @textChange="onTextChange" v-model="value" @returnPress="onReturnPress" />
                 <MDTextView variant="filled" required="true" email="true" hint="fill this out..." @textChange="onTextChange" @returnPress="onReturnPress" />
                 <MDTextView hint="fill this out..." />
             </StackLayout>
diff --git a/demo-vue/app/main.ts b/demo-vue/app/main.ts
@@ -1,30 +1,7 @@
-// import { knownFolders } from '@nativescript/core/file-system';
-// const currentApp = knownFolders.currentApp();
-// global.process = global.process || {} as any;
-// global.process.cwd = function() {
-//     return '';
-// };
-// require('source-map-support').install({
-//     environment: 'node',
-//     handleUncaughtExceptions: false,
-//     retrieveSourceMap(source) {
-//         const sourceMapPath = source + '.map';
-//         const appPath = currentApp.path;
-//         let sourceMapRelativePath = sourceMapPath
-//             // .replace('file:///', '')
-//             .replace('file://', '')
-//             .replace(appPath + '/', '')
-//             .replace(appPath + '/', '');
-//         if (sourceMapRelativePath.startsWith('app/')) {
-//             sourceMapRelativePath = sourceMapRelativePath.slice(4);
-//         }
-//         // console.log('retrieveSourceMap', source, appPath, sourceMapRelativePath, currentApp.getFile(sourceMapRelativePath).readTextSync());
-//         return {
-//             url: sourceMapRelativePath,
-//             map: currentApp.getFile(sourceMapRelativePath).readTextSync()
-//         };
-//     }
-// });
+
+// import {Trace} from '@nativescript/core';
+// Trace.addCategories(Trace.categories.concat(Trace.categories.All));
+// Trace.enable();
 
 import Vue from 'nativescript-vue';
 import ActivityIndicatorPlugin from '@nativescript-community/ui-material-activityindicator/vue';
@@ -57,6 +34,7 @@ Vue.use(BottomSheetPlugin);
 Vue.use(BottomNavigationBarPlugin);
 Vue.use(TabsPlugin);
 
+Vue.registerElement('Label', () => require('@nativescript-community/ui-label').Label);
 Vue.registerElement('PreviousNextView', () => require('@nativescript/iqkeyboardmanager').PreviousNextView);
 Vue.registerElement('TextViewWithHint', () => require('@nativescript/iqkeyboardmanager').TextViewWithHint);
 
diff --git a/demo-vue/app/views/Home.ts b/demo-vue/app/views/Home.ts
@@ -6,13 +6,17 @@ export default {
     <Page>
       <ActionBar title="Material Vue">
       </ActionBar>
-      <ListView ref="listView" rowHeight="50" for="example in examples">
+      <StackLayout>
+      <Label paddingLeft="10" heigth="100" text="This is a text"  verticalAlignment="center"/>
+      <ListView ref="listView" rowHeight="60" for="example in examples">
         <v-template>
-          <MDRipple rippleColor="red" @tap="{goToExample(example)}"  @longPress="{goToModalExample(example)}" >
-            <Label paddingLeft="10" :text="example.title" class="title" verticalAlignment="center"/>
-          </MDRipple>
+          <GridLayout rippleColor="red" @tap="{goToExample(example)}"  @longPress="{goToModalExample(example)}" >
+            <Label paddingLeft="10" :text="example.title"  verticalAlignment="center"/>
+          </GridLayout>
         </v-template>
       </ListView>
+      </StackLayout>
+      
     </Page>
     `,
     data() {
diff --git a/demo-vue/package.json b/demo-vue/package.json
@@ -10,8 +10,9 @@
         }
     },
     "dependencies": {
-        "@akylas/nativescript":"7.0.3-alpha.4",
+        "@akylas/nativescript": "7.0.3-alpha.4",
         "@mdi/font": "4.9.95",
+        "@nativescript-community/ui-label": "^1.0.47",
         "@nativescript-community/ui-material-activityindicator": "file:../packages/activityindicator",
         "@nativescript-community/ui-material-bottomnavigationbar": "file:../packages/bottomnavigationbar",
         "@nativescript-community/ui-material-bottomsheet": "file:../packages/bottomsheet",
@@ -33,9 +34,9 @@
         "nativescript-vue-template-compiler": "~2.8.1"
     },
     "devDependencies": {
-        "@nativescript/core": "7.0.8",
         "@babel/core": "^7.11.6",
         "@nativescript/android": "7.0.0",
+        "@nativescript/core": "7.0.8",
         "@nativescript/types": "7.0.1",
         "@nativescript/webpack": "3.0.4",
         "babel-loader": "^8.1.0",

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
`1`	`1`	`ext {`
`2`		`- androidXMaterial = "1.2.0"`
	`2`	`+ androidXMaterial = "1.2.1"`
	`3`	`+ androidXMaterial = "1.2.1"`
`3`	`4`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,9 @@ button {`
`5`	`5`	`elevation: 2;`
`6`	`6`	`}`
`7`	`7`
	`8`	`+// page {`
	`9`	`+// background-color: black;`
	`10`	`+// }`
`8`	`11`
`9`	`12`	`.falseFAb {`
`10`	`13`	`elevation: 2;`