Skip to content

fix(android): outline button styling #154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
manoldonev merged 3 commits into from
May 10, 2019
Merged

fix(android): outline button styling #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e1e16d3
chore: update demo app
manoldonev May 10, 2019
f3a5f71
fix(android): outline button styling
manoldonev May 10, 2019
fe1559f
chore: lint errors
manoldonev May 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions app/actionBar/actionBar.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Observable } from 'data/observable';
import { topmost } from 'ui/frame';
import { EventData } from "data/observable";
import { Page } from "ui/page";
import { Label } from 'ui/label';
import { Observable } from 'tns-core-modules/data/observable';
import { topmost } from 'tns-core-modules/ui/frame';
import { EventData } from "tns-core-modules/data/observable";
import { Page } from "tns-core-modules/ui/page";
import { Label } from 'tns-core-modules/ui/label';

interface ICustomActionBar extends Page {
ActionBarTitle: string;
Expand Down
4 changes: 2 additions & 2 deletions app/app.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import * as application from 'application';
import * as application from 'tns-core-modules/application';
import { TNSFontIcon, fonticon } from 'nativescript-fonticon';
import { isActive } from './sidedrawer/sidedrawer';
require("nativescript-dom");
var frameCommon = require("ui/frame/frame-common");
var frameCommon = require("tns-core-modules/ui/frame/frame-common");

if (!frameCommon.FrameBase.prototype.eachChild) {
frameCommon.FrameBase.prototype.eachChild =
Expand Down
10 changes: 4 additions & 6 deletions app/main-page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@

import { EventData } from "data/observable";
import { Page } from "ui/page";
import * as app from 'application';
import { isIOS, isAndroid, device } from 'platform';
import { topmost } from 'ui/frame';
import { Color } from 'color';
import { EventData } from "tns-core-modules/data/observable";
import { Page } from "tns-core-modules/ui/page";
import { isIOS } from 'tns-core-modules/platform';
import { topmost } from 'tns-core-modules/ui/frame';
import { NavigationViewModel } from './navigation-vm';

export function navigatingTo(args: EventData) {
Expand Down
4 changes: 1 addition & 3 deletions app/navigation-vm.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import { Observable } from 'data/observable';
import { topmost } from 'ui/frame';
import { topmost } from 'tns-core-modules/ui/frame';
import { BaseModel } from './pages/base';
import { Page } from "ui/page";

export class NavigationViewModel extends BaseModel {

Expand Down
8 changes: 4 additions & 4 deletions app/pages/base.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Observable, EventData } from 'data/observable';
import { topmost } from 'ui/frame';
import { View } from "ui/core/view";
import { Page } from "ui/page";
import { Observable, EventData } from 'tns-core-modules/data/observable';
import { topmost } from 'tns-core-modules/ui/frame';
import { View } from "tns-core-modules/ui/core/view";
import { Page } from "tns-core-modules/ui/page";
import { RadSideDrawer } from 'nativescript-ui-sidedrawer';

export class BaseModel extends Observable {
Expand Down
5 changes: 2 additions & 3 deletions app/pages/basics.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import { EventData } from "data/observable";
import { Page } from "ui/page";
import { EventData } from "tns-core-modules/data/observable";
import { Page } from "tns-core-modules/ui/page";
import { BaseModel } from './base';

export class BasicsModel extends BaseModel {

}


export function navigatingTo(args: EventData) {
var page = <Page>args.object;
page.bindingContext = new BasicsModel(page);
Expand Down
4 changes: 2 additions & 2 deletions app/pages/buttons-active.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { EventData } from "data/observable";
import { Page } from "ui/page";
import { EventData } from "tns-core-modules/data/observable";
import { Page } from "tns-core-modules/ui/page";
import { BaseModel } from './base';

export class ButtonsModel extends BaseModel {
Expand Down
4 changes: 2 additions & 2 deletions app/pages/buttons.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { EventData } from "data/observable";
import { Page } from "ui/page";
import { EventData } from "tns-core-modules/data/observable";
import { Page } from "tns-core-modules/ui/page";
import { BaseModel } from './base';

export class ButtonsModel extends BaseModel {
Expand Down
4 changes: 2 additions & 2 deletions app/pages/colors.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { EventData } from "data/observable";
import { Page } from "ui/page";
import { EventData } from "tns-core-modules/data/observable";
import { Page } from "tns-core-modules/ui/page";
import { BaseModel } from './base';

export class ColorsModel extends BaseModel {
Expand Down
6 changes: 3 additions & 3 deletions app/pages/dialogs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { EventData } from "data/observable";
import { Page } from "ui/page";
import { EventData } from "tns-core-modules/data/observable";
import { Page } from "tns-core-modules/ui/page";
import { BaseModel } from './base';
import * as dialogs from 'ui/dialogs';
import * as dialogs from 'tns-core-modules/ui/dialogs';

export class DialogsModel extends BaseModel {

Expand Down
7 changes: 3 additions & 4 deletions app/pages/forms.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { EventData } from "data/observable";
import { Page } from "ui/page";
import { TextField } from 'ui/text-field';
import { isIOS } from 'platform';
import { EventData } from "tns-core-modules/data/observable";
import { Page } from "tns-core-modules/ui/page";
import { TextField } from 'tns-core-modules/ui/text-field';
import { BaseModel } from './base';

export class FormsModel extends BaseModel {
Expand Down
4 changes: 2 additions & 2 deletions app/pages/listview.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { EventData } from "data/observable";
import { Page } from "ui/page";
import { EventData } from "tns-core-modules/data/observable";
import { Page } from "tns-core-modules/ui/page";
import { BaseModel } from './base';

class DemoItem {
Expand Down
10 changes: 5 additions & 5 deletions app/pages/login-form.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { EventData } from "data/observable";
import { Page } from "ui/page";
import { EventData } from "tns-core-modules/data/observable";
import { Page } from "tns-core-modules/ui/page";
import { BaseModel } from './base';
import * as frameModule from 'ui/frame';
import {Color} from "color";
import {topmost} from 'ui/frame';
import * as frameModule from 'tns-core-modules/ui/frame';
import {Color} from "tns-core-modules/color";
import {topmost} from 'tns-core-modules/ui/frame';

export class ProgressModel extends BaseModel {

Expand Down
10 changes: 5 additions & 5 deletions app/pages/login-landing.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { EventData } from "data/observable";
import { Page } from "ui/page";
import { EventData } from "tns-core-modules/data/observable";
import { Page } from "tns-core-modules/ui/page";
import { BaseModel } from './base';
import * as frameModule from 'ui/frame';
import {Color} from "color";
import {topmost} from 'ui/frame';
import * as frameModule from 'tns-core-modules/ui/frame';
import {Color} from "tns-core-modules/color";
import {topmost} from 'tns-core-modules/ui/frame';

export class ProgressModel extends BaseModel {

Expand Down
2 changes: 1 addition & 1 deletion app/pages/modal.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Observable} from 'data/observable';
import {Observable} from 'tns-core-modules/data/observable';

export function onLoaded(args: any) {
let page = args.object;
Expand Down
8 changes: 3 additions & 5 deletions app/pages/progress.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import { EventData } from "data/observable";
import { Page } from "ui/page";
import { Progress } from "ui/progress";
import {Observable} from 'data/observable';
import {topmost} from 'ui/frame';
import { EventData } from "tns-core-modules/data/observable";
import { Page } from "tns-core-modules/ui/page";
import { Progress } from "tns-core-modules/ui/progress";
import { BaseModel } from './base';

var interval;
Expand Down
4 changes: 2 additions & 2 deletions app/pages/search.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { EventData } from "data/observable";
import { Page } from "ui/page";
import { EventData } from "tns-core-modules/data/observable";
import { Page } from "tns-core-modules/ui/page";
import { BaseModel } from './base';

export class SearchModel extends BaseModel {
Expand Down
4 changes: 2 additions & 2 deletions app/pages/segmentbar.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { EventData } from "data/observable";
import { Page } from "ui/page";
import { EventData } from "tns-core-modules/data/observable";
import { Page } from "tns-core-modules/ui/page";
import { BaseModel } from './base';

export class SegmentModel extends BaseModel {
Expand Down
4 changes: 2 additions & 2 deletions app/pages/sliders.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { EventData } from "data/observable";
import { Page } from "ui/page";
import { EventData } from "tns-core-modules/data/observable";
import { Page } from "tns-core-modules/ui/page";
import { BaseModel } from './base';

export class SlidersModel extends BaseModel {
Expand Down
4 changes: 2 additions & 2 deletions app/pages/switches.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { EventData } from "data/observable";
import { Page } from "ui/page";
import { EventData } from "tns-core-modules/data/observable";
import { Page } from "tns-core-modules/ui/page";
import { BaseModel } from './base';

export class SwitchesModel extends BaseModel {
Expand Down
4 changes: 2 additions & 2 deletions app/pages/tabs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { EventData } from "data/observable";
import { Page } from "ui/page";
import { EventData } from "tns-core-modules/data/observable";
import { Page } from "tns-core-modules/ui/page";
import { BaseModel } from './base';

export class TabsModel extends BaseModel {
Expand Down
8 changes: 3 additions & 5 deletions app/pages/themes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
import { EventData } from "data/observable";
import { Page } from "ui/page";
import { EventData } from "tns-core-modules/data/observable";
import { Page } from "tns-core-modules/ui/page";
import { BaseModel } from './base';
import { knownFolders } from 'file-system';
import { isIOS, isAndroid } from 'platform';
import { knownFolders } from 'tns-core-modules/file-system';
var themes = require('~/theme-support');

export class ThemesModel extends BaseModel {
public labelText: string;
private _toggled: boolean = false;

constructor(page: Page) {
super(page);
Expand Down
1 change: 1 addition & 0 deletions app/scss/platforms/_action-bar.android.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
}

.action-item {
android-elevation: 0;
background-color: rgba(255, 0, 0, 0.0);
border-color: rgba(255, 0, 0, 0.0);
border-width: 1;
Expand Down
1 change: 1 addition & 0 deletions app/scss/platforms/_buttons.android.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
}

.btn-outline {
android-elevation: 0;
background-color: rgba(255, 0, 0, 0.0);
border-width: 1;
border-color: $btn-color;
Expand Down
8 changes: 4 additions & 4 deletions app/sidedrawer/sidedrawer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {Observable} from 'data/observable';
import {topmost} from 'ui/frame';
import { EventData } from "data/observable";
import { Page } from "ui/page";
import {Observable} from 'tns-core-modules/data/observable';
import {topmost} from 'tns-core-modules/ui/frame';
import { EventData } from "tns-core-modules/data/observable";
import { Page } from "tns-core-modules/ui/page";
import { NavigationViewModel } from '../navigation-vm';

export interface ISideDrawerState extends Page {
Expand Down
82 changes: 41 additions & 41 deletions app/sidedrawer/sidedrawer.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,70 +1,70 @@
<StackLayout class="sidedrawer-left" loaded="onLoad">
<StackLayout class="sidedrawer-header">
<Image src="~/sidedrawer/N.png" tap="{{ viewHome }}" class="sidedrawer-header-image"/>
<Label text="NativeScript Theme Project" textWrap="true" class="sidedrawer-header-brand" />
</StackLayout>
<ScrollView>
<StackLayout class="sidedrawer-content">
<GridLayout rows="auto, *" class="sidedrawer-left" loaded="onLoad">
<StackLayout row="0" class="sidedrawer-header">
<Image src="~/sidedrawer/N.png" tap="{{ viewHome }}" class="sidedrawer-header-image"/>
<Label text="NativeScript Theme Project" textWrap="true" class="sidedrawer-header-brand" />
</StackLayout>
<ScrollView row="1">
<StackLayout class="sidedrawer-content">
<GridLayout class="{{ 'home' | isActive }}" tap="{{ viewPage }}" rows="auto" columns="auto,*" pageName="main-page">
<Label text="{{'fa-home' | fonticon }}" class="fa sidedrawer-list-item-icon" row="0" col="0" />
<Label text="Home" class="sidedrawer-list-item-text" row="0" col="1" />
<Label text="{{'fa-home' | fonticon }}" class="fa sidedrawer-list-item-icon" row="0" col="0" />
<Label text="Home" class="sidedrawer-list-item-text" row="0" col="1" />
</GridLayout>
<GridLayout class="{{ 'basics' | isActive }}" tap="{{ viewPage }}" rows="auto" columns="auto,*" pageName="basics">
<Label text="{{'fa-font' | fonticon }}" class="fa sidedrawer-list-item-icon" row="0" col="0" />
<Label text="Basics" class="sidedrawer-list-item-text" row="0" col="1" />
<Label text="{{'fa-font' | fonticon }}" class="fa sidedrawer-list-item-icon" row="0" col="0" />
<Label text="Basics" class="sidedrawer-list-item-text" row="0" col="1" />
</GridLayout>
<GridLayout class="{{ 'buttons' | isActive }}" tap="{{ viewPage }}" rows="auto" columns="auto,*" pageName="buttons">
<Label text="{{'fa-square' | fonticon }}" class="fa sidedrawer-list-item-icon" row="0" col="0" />
<Label text="Buttons" class="sidedrawer-list-item-text" row="0" col="1" />
<Label text="{{'fa-square' | fonticon }}" class="fa sidedrawer-list-item-icon" row="0" col="0" />
<Label text="Buttons" class="sidedrawer-list-item-text" row="0" col="1" />
</GridLayout>
<GridLayout class="{{ 'buttons-active' | isActive }}" tap="{{ viewPage }}" rows="auto" columns="auto,*" pageName="buttons-active">
<Label text="{{'fa-square-o' | fonticon }}" class="fa sidedrawer-list-item-icon" row="0" col="0" />
<Label text="Buttons Active" class="sidedrawer-list-item-text" row="0" col="1" />
<Label text="{{'fa-square-o' | fonticon }}" class="fa sidedrawer-list-item-icon" row="0" col="0" />
<Label text="Buttons Active" class="sidedrawer-list-item-text" row="0" col="1" />
</GridLayout>
<GridLayout class="{{ 'colors' | isActive }}" tap="{{ viewPage }}" rows="auto" columns="auto,*" pageName="colors">
<Label text="{{'fa-eyedropper' | fonticon }}" class="fa sidedrawer-list-item-icon" row="0" col="0" />
<Label text="Colors" class="sidedrawer-list-item-text" row="0" col="1" />
<Label text="{{'fa-eyedropper' | fonticon }}" class="fa sidedrawer-list-item-icon" row="0" col="0" />
<Label text="Colors" class="sidedrawer-list-item-text" row="0" col="1" />
</GridLayout>
<GridLayout class="{{ 'forms' | isActive }}" tap="{{ viewPage }}" rows="auto" columns="auto,*" pageName="forms">
<Label text="{{'fa-i-cursor' | fonticon }}" class="fa sidedrawer-list-item-icon" row="0" col="0" />
<Label text="Forms" class="sidedrawer-list-item-text" row="0" col="1" />
<Label text="{{'fa-i-cursor' | fonticon }}" class="fa sidedrawer-list-item-icon" row="0" col="0" />
<Label text="Forms" class="sidedrawer-list-item-text" row="0" col="1" />
</GridLayout>
<GridLayout class="{{ 'search' | isActive }}" tap="{{ viewPage }}" rows="auto" columns="auto,*" pageName="search">
<Label text="{{'fa-search' | fonticon }}" class="fa sidedrawer-list-item-icon" row="0" col="0" />
<Label text="Search Bars" class="sidedrawer-list-item-text" row="0" col="1" />
<Label text="{{'fa-search' | fonticon }}" class="fa sidedrawer-list-item-icon" row="0" col="0" />
<Label text="Search Bars" class="sidedrawer-list-item-text" row="0" col="1" />
</GridLayout>
<GridLayout class="{{ 'sliders' | isActive }}" tap="{{ viewPage }}" rows="auto" columns="auto,*" pageName="sliders">
<Label text="{{'fa-sliders' | fonticon }}" class="fa sidedrawer-list-item-icon" row="0" col="0" />
<Label text="Sliders" class="sidedrawer-list-item-text" row="0" col="1" />
<Label text="{{'fa-sliders' | fonticon }}" class="fa sidedrawer-list-item-icon" row="0" col="0" />
<Label text="Sliders" class="sidedrawer-list-item-text" row="0" col="1" />
</GridLayout>
<GridLayout class="{{ 'switches' | isActive }}" tap="{{ viewPage }}" rows="auto" columns="auto,*" pageName="switches">
<Label text="{{'fa-toggle-on' | fonticon }}" class="fa sidedrawer-list-item-icon" row="0" col="0" />
<Label text="Switches" class="sidedrawer-list-item-text" row="0" col="1" />
<Label text="{{'fa-toggle-on' | fonticon }}" class="fa sidedrawer-list-item-icon" row="0" col="0" />
<Label text="Switches" class="sidedrawer-list-item-text" row="0" col="1" />
</GridLayout>
<GridLayout class="{{ 'progress' | isActive }}" tap="{{ viewPage }}" rows="auto" columns="auto,*" pageName="progress">
<Label text="{{'fa-spinner' | fonticon }}" class="fa sidedrawer-list-item-icon" row="0" col="0" />
<Label text="Progress & Activity" class="sidedrawer-list-item-text" row="0" col="1" />
<Label text="{{'fa-spinner' | fonticon }}" class="fa sidedrawer-list-item-icon" row="0" col="0" />
<Label text="Progress & Activity" class="sidedrawer-list-item-text" row="0" col="1" />
</GridLayout>
<GridLayout class="{{ 'tabs' | isActive }}" tap="{{ viewPage }}" rows="auto" columns="auto,*" pageName="tabs">
<Label text="{{'fa-road' | fonticon }}" class="fa sidedrawer-list-item-icon" row="0" col="0" />
<Label text="Tabs" class="sidedrawer-list-item-text" row="0" col="1" />
<Label text="{{'fa-road' | fonticon }}" class="fa sidedrawer-list-item-icon" row="0" col="0" />
<Label text="Tabs" class="sidedrawer-list-item-text" row="0" col="1" />
</GridLayout>
<GridLayout class="{{ 'segmentbar' | isActive }}" tap="{{ viewPage }}" rows="auto" columns="auto,*" pageName="segmentbar">
<Label text="{{'fa-columns' | fonticon }}" class="fa sidedrawer-list-item-icon" row="0" col="0" />
<Label text="SegmentedBar" class="sidedrawer-list-item-text" row="0" col="1" />
<GridLayout class="{{ 'segmentbar' | isActive }}" tap="{{ viewPage }}" rows="auto" columns="auto,*" pageName="segmentbar">
<Label text="{{'fa-columns' | fonticon }}" class="fa sidedrawer-list-item-icon" row="0" col="0" />
<Label text="SegmentedBar" class="sidedrawer-list-item-text" row="0" col="1" />
</GridLayout>
<GridLayout class="{{ 'dialogs' | isActive }}" tap="{{ viewPage }}" rows="auto" columns="auto,*" pageName="dialogs">
<Label text="{{'fa-newspaper-o' | fonticon }}" class="fa sidedrawer-list-item-icon" row="0" col="0" />
<Label text="Dialogs" class="sidedrawer-list-item-text" row="0" col="1"/>
<Label text="{{'fa-newspaper-o' | fonticon }}" class="fa sidedrawer-list-item-icon" row="0" col="0" />
<Label text="Dialogs" class="sidedrawer-list-item-text" row="0" col="1"/>
</GridLayout>
<GridLayout class="{{ 'list' | isActive }}" tap="{{ viewPage }}" rows="auto" columns="auto,*" pageName="listview">
<Label text="{{'fa-list' | fonticon }}" class="fa sidedrawer-list-item-icon" row="0" col="0" />
<Label text="ListView" class="sidedrawer-list-item-text" row="0" col="1" />
<Label text="{{'fa-list' | fonticon }}" class="fa sidedrawer-list-item-icon" row="0" col="0" />
<Label text="ListView" class="sidedrawer-list-item-text" row="0" col="1" />
</GridLayout>
<GridLayout class="{{ 'theme' | isActive }}" tap="{{ viewPage }}" rows="auto" columns="auto,*" pageName="themes">
<Label text="{{'fa-paint-brush' | fonticon }}" class="fa sidedrawer-list-item-icon" row="0" col="0" />
<Label text="Themes" class="sidedrawer-list-item-text" row="0" col="1" />
<Label text="{{'fa-paint-brush' | fonticon }}" class="fa sidedrawer-list-item-icon" row="0" col="0" />
<Label text="Themes" class="sidedrawer-list-item-text" row="0" col="1" />
</GridLayout>
</StackLayout>
</ScrollView>
</StackLayout>
</StackLayout>
</ScrollView>
</GridLayout>
Loading