Compare commits
3 Commits
2bcc2c9585
...
icon
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
46a4bfcd27 | ||
|
|
efc2453243 | ||
|
|
2e81a635ee |
|
Before Width: | Height: | Size: 33 KiB After Width: | Height: | Size: 7.5 KiB |
|
Before Width: | Height: | Size: 9.1 KiB |
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 3.9 KiB |
|
Before Width: | Height: | Size: 64 KiB After Width: | Height: | Size: 9.0 KiB |
|
Before Width: | Height: | Size: 91 KiB After Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 122 KiB After Width: | Height: | Size: 17 KiB |
|
Before Width: | Height: | Size: 32 KiB After Width: | Height: | Size: 7.7 KiB |
|
Before Width: | Height: | Size: 9.1 KiB |
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 4.0 KiB |
|
Before Width: | Height: | Size: 65 KiB After Width: | Height: | Size: 9.6 KiB |
|
Before Width: | Height: | Size: 90 KiB After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 119 KiB After Width: | Height: | Size: 17 KiB |
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 3.9 KiB |
@@ -1,9 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<background>
|
||||
<inset android:drawable="@mipmap/ic_launcher_background" android:inset="16.7%" />
|
||||
</background>
|
||||
<foreground>
|
||||
<inset android:drawable="@mipmap/ic_launcher_foreground" android:inset="16.7%" />
|
||||
</foreground>
|
||||
<background android:drawable="@color/ic_launcher_background"/>
|
||||
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
|
||||
</adaptive-icon>
|
||||
@@ -1,9 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<background>
|
||||
<inset android:drawable="@mipmap/ic_launcher_background" android:inset="16.7%" />
|
||||
</background>
|
||||
<foreground>
|
||||
<inset android:drawable="@mipmap/ic_launcher_foreground" android:inset="16.7%" />
|
||||
</foreground>
|
||||
<background android:drawable="@color/ic_launcher_background"/>
|
||||
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
|
||||
</adaptive-icon>
|
||||
|
Before Width: | Height: | Size: 660 B |
|
Before Width: | Height: | Size: 5.1 KiB After Width: | Height: | Size: 3.4 KiB |
|
Before Width: | Height: | Size: 296 B |
|
Before Width: | Height: | Size: 2.1 KiB |
|
Before Width: | Height: | Size: 408 B |
|
Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 2.1 KiB |
|
Before Width: | Height: | Size: 1006 B |
|
Before Width: | Height: | Size: 7.5 KiB After Width: | Height: | Size: 4.9 KiB |
|
Before Width: | Height: | Size: 1.8 KiB |
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 9.6 KiB |
|
Before Width: | Height: | Size: 2.5 KiB |
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 15 KiB |
@@ -1,7 +1,7 @@
|
||||
<?xml version='1.0' encoding='utf-8'?>
|
||||
<resources>
|
||||
<string name="app_name">Allowance Planner V2</string>
|
||||
<string name="title_activity_main">Allowance Planner V2</string>
|
||||
<string name="app_name">allowance-planner-v2</string>
|
||||
<string name="title_activity_main">allowance-planner-v2</string>
|
||||
<string name="package_name">io.ionic.starter</string>
|
||||
<string name="custom_url_scheme">io.ionic.starter</string>
|
||||
</resources>
|
||||
|
||||
|
Before Width: | Height: | Size: 130 KiB |
@@ -2,7 +2,7 @@ import type { CapacitorConfig } from '@capacitor/cli';
|
||||
|
||||
const config: CapacitorConfig = {
|
||||
appId: 'io.ionic.starter',
|
||||
appName: 'Allowance Planner V2',
|
||||
appName: 'allowance-planner-v2',
|
||||
webDir: 'www'
|
||||
};
|
||||
|
||||
|
||||
@@ -30,7 +30,8 @@ button {
|
||||
color: white;
|
||||
padding: 10px;
|
||||
width: 250px;
|
||||
margin-top: 100px;
|
||||
margin-top: auto;
|
||||
margin-bottom: 50px;
|
||||
}
|
||||
|
||||
button:disabled,
|
||||
|
||||
@@ -36,7 +36,7 @@ export class AllowancePage implements ViewWillEnter {
|
||||
allowance[0].name = 'Main Allowance';
|
||||
this.allowance$.next(allowance);
|
||||
})
|
||||
}, 100);
|
||||
}, 50);
|
||||
}
|
||||
|
||||
canFinishGoal(allowance: Allowance): boolean {
|
||||
|
||||
@@ -7,6 +7,11 @@
|
||||
<ion-title *ngIf="isAddMode">Create Goal</ion-title>
|
||||
<ion-title *ngIf="!isAddMode && goalId != 0">Edit Goal</ion-title>
|
||||
<ion-title *ngIf="!isAddMode && goalId == 0">Edit Allowance</ion-title>
|
||||
<button
|
||||
*ngIf="!isAddMode && goalId !=0"
|
||||
class="remove-button"
|
||||
(click)="deleteAllowance()"
|
||||
>Delete Goal</button>
|
||||
</div>
|
||||
</ion-toolbar>
|
||||
</ion-header>
|
||||
@@ -38,10 +43,5 @@
|
||||
<span *ngIf="!isAddMode && goalId != 0">Update Goal</span>
|
||||
<span *ngIf="!isAddMode && goalId == 0">Update Allowance</span>
|
||||
</button>
|
||||
<button
|
||||
*ngIf="!isAddMode && goalId !=0"
|
||||
class="remove-button"
|
||||
(click)="deleteAllowance()"
|
||||
>Delete Goal</button>
|
||||
</form>
|
||||
</ion-content>
|
||||
|
||||
@@ -4,8 +4,10 @@
|
||||
}
|
||||
|
||||
.remove-button {
|
||||
margin-top: 10px;
|
||||
background-color: var(--negative-amount-color);
|
||||
background-color: var(--ion-color-primary);
|
||||
margin-right: 15px;
|
||||
width: 100px;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
form {
|
||||
@@ -45,7 +47,8 @@ button {
|
||||
color: white;
|
||||
padding: 10px;
|
||||
width: 250px;
|
||||
margin-top: 100px;
|
||||
margin-top: auto;
|
||||
margin-bottom: 50px;
|
||||
}
|
||||
|
||||
button:disabled,
|
||||
|
||||
@@ -6,6 +6,11 @@
|
||||
</div>
|
||||
<ion-title *ngIf="isAddMode">Create Task</ion-title>
|
||||
<ion-title *ngIf="!isAddMode">Edit Task</ion-title>
|
||||
<button
|
||||
*ngIf="!isAddMode"
|
||||
class="remove-button"
|
||||
(click)="deleteTask()"
|
||||
>Delete task</button>
|
||||
</div>
|
||||
</ion-toolbar>
|
||||
</ion-header>
|
||||
@@ -27,10 +32,5 @@
|
||||
<span *ngIf="isAddMode">Add Task</span>
|
||||
<span *ngIf="!isAddMode">Update Task</span>
|
||||
</button>
|
||||
<button
|
||||
*ngIf="!isAddMode"
|
||||
class="remove-button"
|
||||
(click)="deleteTask()"
|
||||
>Delete task</button>
|
||||
</form>
|
||||
</ion-content>
|
||||
|
||||
@@ -4,8 +4,10 @@
|
||||
}
|
||||
|
||||
.remove-button {
|
||||
margin-top: 10px;
|
||||
background-color: var(--negative-amount-color);
|
||||
background-color: var(--ion-color-primary);
|
||||
margin-right: 15px;
|
||||
width: 95px;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
form {
|
||||
@@ -34,7 +36,8 @@ button {
|
||||
color: white;
|
||||
padding: 10px;
|
||||
width: 250px;
|
||||
margin-top: 100px;
|
||||
margin-top: auto;
|
||||
margin-bottom: 50px;
|
||||
}
|
||||
|
||||
button:disabled,
|
||||
|
||||
@@ -8,7 +8,6 @@
|
||||
|
||||
.left {
|
||||
width: 70%;
|
||||
font-size: 18px;
|
||||
}
|
||||
|
||||
.date {
|
||||
|
||||
@@ -18,12 +18,8 @@
|
||||
<div class="task" *ngFor="let task of tasks$ | async">
|
||||
<button (click)="completeTask(task.id)">Done</button>
|
||||
<div (click)="updateTask(task.id)" class="item">
|
||||
<div class="text">
|
||||
<div class="name">
|
||||
{{ task.name }}
|
||||
<span class="assigned">{{ usernames[task.assigned ? task.assigned : 0] }}</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="name">{{ task.name }}</div>
|
||||
<div class="assigned">{{ usernames[task.assigned ? task.assigned : 0] }}</div>
|
||||
<div
|
||||
class="reward"
|
||||
[ngClass]="{ 'negative': task.reward < 0 }"
|
||||
|
||||
@@ -31,8 +31,6 @@ mat-icon {
|
||||
align-items: center;
|
||||
border-bottom: 1px solid var(--line-color);
|
||||
padding: 5px;
|
||||
padding-block: 10px;
|
||||
font-size: 18px;
|
||||
}
|
||||
|
||||
.item {
|
||||
@@ -43,6 +41,7 @@ mat-icon {
|
||||
}
|
||||
|
||||
.name {
|
||||
margin-left: 10px;
|
||||
color: var(--font-color);
|
||||
}
|
||||
|
||||
@@ -50,7 +49,6 @@ mat-icon {
|
||||
margin-left: auto;
|
||||
margin-right: 15px;
|
||||
color: var(--positive-amount-color);
|
||||
font-size: 22px;
|
||||
}
|
||||
|
||||
.negative {
|
||||
@@ -58,28 +56,21 @@ mat-icon {
|
||||
}
|
||||
|
||||
button {
|
||||
height: 45px;
|
||||
width: 57px;
|
||||
height: 30px;
|
||||
border-radius: 10px;
|
||||
color: white;
|
||||
background: var(--confirm-button-color);
|
||||
padding-inline: 15px;
|
||||
}
|
||||
|
||||
.add-button {
|
||||
background-color: var(--ion-color-primary);
|
||||
margin-right: 15px;
|
||||
height: 30px;
|
||||
width: 75px;
|
||||
}
|
||||
|
||||
.assigned {
|
||||
color: var(--line-color);
|
||||
margin-left: 3px;
|
||||
font-size: 15px;
|
||||
}
|
||||
|
||||
.text {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
width: 60%;
|
||||
margin-left: 10px;
|
||||
font-size: 12px;
|
||||
}
|
||||
@@ -33,7 +33,7 @@ export class TasksPage implements ViewWillEnter {
|
||||
this.taskService.getTaskList().subscribe(tasks => {
|
||||
this.tasks$.next(tasks);
|
||||
});
|
||||
}, 100);
|
||||
}, 50);
|
||||
}
|
||||
|
||||
createTask() {
|
||||
|
||||
|
Before Width: | Height: | Size: 38 KiB After Width: | Height: | Size: 38 KiB |
|
Before Width: | Height: | Size: 163 KiB After Width: | Height: | Size: 163 KiB |
@@ -38,7 +38,6 @@
|
||||
|
||||
ion-title {
|
||||
color: var(--ion-color-primary);
|
||||
font-size: 24px;
|
||||
}
|
||||
|
||||
ion-header {
|
||||
@@ -47,15 +46,4 @@ ion-header {
|
||||
|
||||
button {
|
||||
font-size: 16px;
|
||||
}
|
||||
|
||||
ion-header.md {
|
||||
ion-toolbar:first-child {
|
||||
--padding-top: 27px;
|
||||
height: 66px;
|
||||
}
|
||||
}
|
||||
|
||||
label {
|
||||
font-size: 18px;
|
||||
}
|
||||