Skip to content

Commit

Permalink
huge bump
Browse files Browse the repository at this point in the history
  • Loading branch information
@farfromrefug
farfromrefug committed Nov 11, 2020
1 parent c8f6dc1 commit ec84c1a
Show file tree
Hide file tree
Showing 101 changed files with 7,311 additions and 7,494 deletions.
13 changes: 8 additions & 5 deletions .eslintrc.js
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
module.exports = {
extends: ['plugin:prettier/recommended'],
plugins: ['prettier', '@typescript-eslint'],
parser: '@typescript-eslint/parser',
extends: ['plugin:prettier/recommended', 'plugin:vue/essential'],

parser: 'vue-eslint-parser',
parserOptions: {
parser: '@typescript-eslint/parser',
createDefaultProgram: true,
project: './tsconfig.json',
project: 'tsconfig.json',
},
plugins: ['prettier', '@typescript-eslint'],
rules: {
'prettier/prettier': 'warn',
'vue/custom-event-name-casing': 'off',
'@typescript-eslint/adjacent-overload-signatures': 'error',
'@typescript-eslint/array-type': 'error',
'@typescript-eslint/await-thenable': 'error',
Expand Down Expand Up @@ -119,7 +122,7 @@ module.exports = {
'no-constant-condition': 'error',
'no-control-regex': 'off',
'no-debugger': 'error',
'no-duplicate-imports': ['error', { includeExports: true }],
'no-duplicate-imports': 'error',
'no-empty': 'off',
'no-eval': 'off',
'no-extra-semi': 'off',
Expand Down
1 change: 0 additions & 1 deletion android_apk
View file

This file was deleted.

1 change: 0 additions & 1 deletion android_bundle
View file

This file was deleted.

454 changes: 454 additions & 0 deletions app.webpack.config.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/App_Resources/Android/src/main/res/drawable-nodpi/splash_screen.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
</item> -->
<item>
<shape android:shape="rectangle">
<solid android:color="@color/ns_primary" />
<solid android:color="@color/colorPrimary" />
</shape>
</item>
<item>
Expand Down
2 changes: 1 addition & 1 deletion app/App_Resources/Android/src/main/res/mipmap-anydpi-v26/icon.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ns_accent"/>
<background android:drawable="@color/colorAccent"/>
<foreground android:drawable="@mipmap/icon_transparent"/>
</adaptive-icon>
2 changes: 1 addition & 1 deletion app/App_Resources/Android/src/main/res/values-v21/colors.xml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="ns_accent">#29B6F6</color>
<color name="colorAccent">#29B6F6</color>
</resources>
10 changes: 5 additions & 5 deletions app/App_Resources/Android/src/main/res/values/colors.xml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="ns_primary">#0288D1</color>
<color name="background">#ffffff</color>
<color name="ns_primaryDark">#0288D1</color>
<color name="ns_accent">#29B6F6</color>
<color name="ns_secondary">#29B6F6</color>
<color name="buttonTextColor">#ffffff</color>
<color name="colorPrimary">#29B6F6</color>
<color name="colorPrimaryDark">#0288D1</color>
<color name="colorAccent">#29B6F6</color>
<color name="colorSecondary">#29B6F6</color>
</resources>
22 changes: 11 additions & 11 deletions app/App_Resources/Android/src/main/res/values/styles.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,29 +5,29 @@
<style name="LaunchScreenThemeBase" parent="Theme.MaterialComponents.NoActionBar">
<item name="toolbarStyle">@style/NativeScriptToolbarStyle</item>

<item name="colorPrimary">@color/ns_primary</item>
<item name="colorPrimaryDark">@color/ns_primaryDark</item>
<item name="colorSecondary">@color/ns_secondary</item>
<item name="colorAccent">@color/ns_accent</item>
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorOnPrimary">@color/colorPrimaryDark</item>
<item name="colorSecondary">@color/colorSecondary</item>
<item name="colorAccent">@color/colorAccent</item>

<item name="android:windowBackground">@drawable/splash_screen</item>

<item name="android:windowActionBarOverlay">true</item>
<item name="android:windowTranslucentStatus">true</item>
<item name="android:windowTranslucentNavigation">true</item>
</style>

<style name="LaunchScreenTheme" parent="LaunchScreenThemeBase">
</style>

<!-- theme to use AFTER launch screen is loaded-->
<style name="AppThemeBase" parent="Theme.MaterialComponents.NoActionBar">
<item name="toolbarStyle">@style/NativeScriptToolbarStyle</item>
<item name="android:windowTranslucentStatus">true</item>
<item name="colorPrimary">@color/ns_primary</item>
<item name="colorPrimaryDark">@color/ns_primaryDark</item>
<item name="colorSecondary">@color/ns_secondary</item>
<item name="colorAccent">@color/ns_accent</item>
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorOnPrimary">@color/buttonTextColor</item>
<item name="colorSecondary">@color/colorSecondary</item>
<item name="colorAccent">@color/colorAccent</item>
<item name="android:windowTranslucentStatus">true</item>
<item name="android:windowTranslucentNavigation">true</item>
</style>
Expand All @@ -37,7 +37,7 @@

<!-- theme for actioon-bar -->
<style name="NativeScriptToolbarStyleBase" parent="Widget.AppCompat.Toolbar">
<item name="android:background">@color/ns_primary</item>
<item name="android:background">@color/colorPrimary</item>
<item name="theme">@style/ThemeOverlay.AppCompat.ActionBar</item>
<item name="popupTheme">@style/ThemeOverlay.AppCompat</item>
</style>
Expand Down
115 changes: 27 additions & 88 deletions app/app.scss
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
@import './variables';
@import './animations';
@import '~nativescript-vue-fab/style';

.lato {
font-family: 'Lato Regular', 'res/lato';
Expand All @@ -19,19 +18,11 @@
// @extend .lato;
// }

page {
// .ns-light & {
Page {
status-bar-style: dark;
// navigation-bar-color: #ddd;
navigation-bar-color: $primary-color;
status-bar-color: $dark-color;
}

button {
background-color: transparent;
color: $primary-color;
}
// label,
canvaslabel,
htmllabel {
color: $text-color;
Expand All @@ -42,12 +33,6 @@ mdactivityindicator {
height: 50;
}

mdbutton {
background-color: transparent;
color: $primary-color;
ripple-color: $dark-color;
}

.cardView {
border-radius: 2;
elevation: 1;
Expand All @@ -61,11 +46,11 @@ mdbutton {
color: white;
ripple-color: white;
}
.buttonthemed {
background-color: $primary-color;
color: white;
ripple-color: $dark-color;
}
// .buttonthemed {
// background-color: $primary-color;
// color: white;
// ripple-color: $dark-color;
// }
.buttontext {
background-color: white;
color: $primary-color;
Expand Down Expand Up @@ -127,7 +112,7 @@ mdbutton {
}

.floating-btn {
@extend .mdi, .buttonthemed;
@extend .mdi;
elevation: 6;
dynamicelevationoffset: 6;
font-size: 24;
Expand All @@ -139,7 +124,6 @@ mdbutton {
}
.small-floating-btn {
@extend .mdi, .buttontext;
color: $primary-color;
elevation: 3;
dynamicelevationoffset: 3;
font-size: 24;
Expand All @@ -153,88 +137,43 @@ mdbutton {
font-size: 10;
}

.borderBottom {
border-bottom-color: #eeeeee;
border-bottom-width: 1;
}

.borderTop {
border-top-color: #eeeeee;
border-top-width: 1;
MDSpeedDialButton, MDSpeedDialItemButton {
@extend .mdi ;
// color: white;
}

.borderRight {
border-right-color: #eeeeee;
border-right-width: 1;
}
.borderLeft {
border-left-color: #eeeeee;
border-left-width: 1;
MDSpeedDialButton {
// background-color: $primary-color;
}

.fab {
.fab-item-title {
background-color: #444;
vertical-text-alignment: middle;
border-radius: 6;
color: white;
}

.fab-button,
.fab-item {
background-color: $primary-color;
ripple-color: $dark-color;
}
.fab-icon,
.fab-item {
color: white;
}
.fab-backdrop {
background-color: rgba(0, 0, 0, 0.4);
}
MDSpeedDialItemTitle {
background-color: #444;
vertical-text-alignment: middle;
border-radius: 6;
font-size:11;
color: white;
padding:6;
}

.menuButtons {
padding-left: 12;
padding-right: 12;
margin-bottom: 10;
}
// .menuButtons {
// padding-left: 12;
// padding-right: 12;
// margin-bottom: 10;
// }

.menu-btn {
@extend .icon-btn;
border-radius: 22;
ripple-color: #b8b7b7;
color: $accent-color;
// ripple-color: #b8b7b7;
// color: $accent-color;
}
.menuButtons mdbutton {
@extend .menu-btn;
}

.details {
padding: 10;
}

.details-label {
font-size: 14;
horizontal-alignment: left;
vertical-alignment: center;
text-alignment: left;
color: white;
}
.details-icon {
@extend .mdi;
margin-right: 10;
color: gray;
}

// .android .overMapWidgets {
// padding: 0 0 $navigation-bar-height 0;
// }

.navigationBarOverlay {
height: $navigation-bar-height;
width: 100%;
background-color: #88000000;
background-color: #aa000000;
vertical-alignment: bottom;
}

Expand Down
0 app/assets/maki.css → app/assets/maki.css.old
View file
File renamed without changes.
34 changes: 16 additions & 18 deletions app/components/AlpiMapsPage.ts
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Component, Prop } from 'vue-property-decorator';
import BaseVueComponent from './BaseVueComponent';
import { NavigationEntry, Page, topmost } from '@nativescript/core/ui/frame/frame';
import { Color, NavigationEntry, Page } from '@nativescript/core';
import { VueConstructor } from 'vue';
import { primaryColor } from '~/variables';

Expand All @@ -18,14 +18,12 @@ export default class AlpiMapsPage extends BaseVueComponent {
@Prop({ default: false, type: Boolean })
public modal: boolean;

@Prop({ default: false, type: Boolean })
public actionBarHidden: boolean;

@Prop({ default: true, type: Boolean })
public actionBarShowLogo: boolean;

@Prop({ default: primaryColor, type: String })
public actionBarBackroundColor: string;
@Prop({ default: () => primaryColor, type: Color })
public actionBarBackroundColor: Color;

@Prop({ type: Number })
public actionBarHeight: number;
Expand All @@ -38,7 +36,7 @@ export default class AlpiMapsPage extends BaseVueComponent {
public loading = false;

get page() {
return this.getRef('page') as Page;
return this.getRef<Page>('page');
}
destroyed() {
super.destroyed();
Expand All @@ -49,18 +47,18 @@ export default class AlpiMapsPage extends BaseVueComponent {
}
const page = this.page;
if (page) {
page.actionBarHidden = true;
// if (gVars.isIOS) {
page.backgroundSpanUnderStatusBar = true;
// page.statusBarStyle = 'light';
// page.eachChildView(view => {
// view.style.paddingTop = 0.00001;
// return false;
// });
// } else {
// page.androidStatusBarBackground = null;
// page.androidStatusBarBackground = new Color(this.darkColor);
// }
// page.actionBarHidden = true;
if (global.isIOS) {
page.backgroundSpanUnderStatusBar = true;
// page.statusBarStyle = 'light';
// page.eachChildView(view => {
// view.style.paddingTop = 0.00001;
// return false;
// });
// } else {
// page.androidStatusBarBackground = null;
// page.androidStatusBarBackground = new Color(this.darkColor);
}
// page.backgroundColor = this.darkColor;
// page.backgroundColor = this.themeColor;
// page.on(Page.navigatingToEvent, () => {
Expand Down
2 changes: 1 addition & 1 deletion app/components/AlpiMapsPage.vue
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<Page ref="page" :navigateUrl="navigateUrl" @navigatedTo="$emit('navigatedTo', $event)" backgroundColor="transparent">
<Page ref="page" :navigateUrl="navigateUrl" @navigatedTo="$emit('navigatedTo', $event)" backgroundColor="transparent" actionBarHidden="true">
<!-- <GridLayout rows="auto,*"> -->

<GridLayout>
Expand Down
Loading

0 comments on commit ec84c1a

Please sign in to comment.