-
{{ currentDisplay }}
+
+ {{ currentDisplay }}
+
+
+
+
+
+ C
+
+
+ {{ digits[0] }}
+
{{ decimalSeparator }}
{{ `${digits[0]}${digits[0]}` }}
-
- {{ digits[0] }}
-
-
-
-
-
-
{{ confirmText }}
@@ -467,12 +468,15 @@ watch(() => props.flipNegative, (newValue) => {
}
.numpad-values {
+ display: flex;
+ align-items: center;
border-bottom: 1px solid var(--f7-page-bg-color);
}
.numpad-value {
display: flex;
position: relative;
+ flex: 1;
padding-inline-start: 16px;
line-height: 1;
height: var(--ebk-numpad-value-height);
@@ -481,6 +485,22 @@ watch(() => props.flipNegative, (newValue) => {
user-select: none;
}
+.numpad-backspace-button {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ width: 20%;
+ height: var(--ebk-numpad-value-height);
+ font-size: 22px;
+ color: var(--f7-color-black);
+ flex-shrink: 0;
+ border-left: 1px solid var(--f7-page-bg-color);
+}
+
+.dark .numpad-backspace-button {
+ color: var(--f7-color-white);
+}
+
.numpad-value-small {
font-size: var(--ebk-numpad-value-small-font-size);
}
diff --git a/src/router/mobile.ts b/src/router/mobile.ts
index 17c4a1fe..0406b063 100644
--- a/src/router/mobile.ts
+++ b/src/router/mobile.ts
@@ -159,7 +159,8 @@ const routes: Router.RouteParameters[] = [
{
path: '/transaction/list',
async: asyncResolve(TransactionListPage),
- beforeEnter: [checkLogin]
+ beforeEnter: [checkLogin],
+ options: { animate: false }
},
{
path: '/transaction/filter/amount',
@@ -184,7 +185,8 @@ const routes: Router.RouteParameters[] = [
{
path: '/account/list',
async: asyncResolve(AccountListPage),
- beforeEnter: [checkLogin]
+ beforeEnter: [checkLogin],
+ options: { animate: false }
},
{
path: '/account/add',
@@ -209,7 +211,8 @@ const routes: Router.RouteParameters[] = [
{
path: '/statistic/transaction',
async: asyncResolve(StatisticsTransactionPage),
- beforeEnter: [checkLogin]
+ beforeEnter: [checkLogin],
+ options: { animate: false }
},
{
path: '/statistic/settings',
@@ -259,7 +262,8 @@ const routes: Router.RouteParameters[] = [
{
path: '/settings',
async: asyncResolve(SettingsPage),
- beforeEnter: [checkLogin]
+ beforeEnter: [checkLogin],
+ options: { animate: false }
},
{
path: '/app_lock',
diff --git a/src/styles/mobile/global.scss b/src/styles/mobile/global.scss
index 6379c28d..c34cc764 100644
--- a/src/styles/mobile/global.scss
+++ b/src/styles/mobile/global.scss
@@ -3,6 +3,15 @@ html, body {
position: fixed;
}
+:root {
+ --f7-page-transition-duration: 150ms;
+ --f7-sheet-transition-duration: 150ms;
+ --f7-actions-transition-duration: 150ms;
+ --f7-popup-transition-duration: 150ms;
+ --f7-dialog-transition-duration: 150ms;
+ --f7-popover-transition-duration: 150ms;
+}
+
body {
-ms-user-select: none;
-webkit-user-select: none;
diff --git a/src/views/mobile/transactions/EditPage.vue b/src/views/mobile/transactions/EditPage.vue
index 86b7509b..6f87e9e7 100644
--- a/src/views/mobile/transactions/EditPage.vue
+++ b/src/views/mobile/transactions/EditPage.vue
@@ -459,10 +459,12 @@
{{ tt('Add Picture') }}
+ {{ tt('Edit') }}
{{ tt('Duplicate') }}
{{ tt('Duplicate (With Time)') }}
{{ tt('Duplicate (With Geographic Location)') }}
{{ tt('Duplicate (With Time and Geographic Location)') }}
+ {{ tt('Delete') }}
{{ tt('Cancel') }}
@@ -640,6 +642,7 @@ const pictureInput = useTemplateRef('pictureInput');
const isSupportClipboard = !!navigator.clipboard;
const loadingError = ref(null);
+const isFirstEntry = ref(true);
const removingPictureId = ref(null);
const transactionDateTimeSheetMode = ref('time');
const showTimeInDefaultTimezone = ref(false);
@@ -1319,6 +1322,28 @@ function duplicate(withTime?: boolean, withGeoLocation?: boolean): void {
props.f7router.navigate(`/transaction/add?id=${transaction.value.id}&type=${transaction.value.type}&withTime=${withTime ?? false}&withGeoLocation=${withGeoLocation ?? false}`);
}
+function navigateToEdit(): void {
+ props.f7router.navigate(`/transaction/edit?id=${transaction.value.id}&type=${transaction.value.type}`);
+}
+
+function remove(): void {
+ showConfirm('Are you sure you want to delete this transaction?', () => {
+ showLoading();
+ transactionsStore.deleteTransaction({
+ transaction: transaction.value,
+ defaultCurrency: defaultCurrency.value
+ }).then(() => {
+ hideLoading();
+ props.f7router.back();
+ }).catch(error => {
+ hideLoading();
+ if (!error.processed) {
+ showToast(error.message || error);
+ }
+ });
+ });
+}
+
function onPageAfterIn(): void {
routeBackOnError(props.f7router, loadingError);
@@ -1326,6 +1351,21 @@ function onPageAfterIn(): void {
&& !geoLocationStatus.value && !transaction.value.geoLocation) {
updateGeoLocation(false);
}
+
+ if (isFirstEntry.value) {
+ isFirstEntry.value = false;
+ return;
+ }
+
+ if (mode.value === TransactionEditPageMode.View && query['id']) {
+ transactionsStore.getTransaction({ transactionId: query['id'], withPictures: true }).then(t => {
+ setTransactionModel(t, {}, true);
+ }).catch(error => {
+ if (!error.processed) {
+ showToast(error.message || error);
+ }
+ });
+ }
}
function onPageBeforeOut(): void {