From b898d1541fff2d3e3ef6c6caf4fca054d4fa5029 Mon Sep 17 00:00:00 2001 From: "Emmanuele (WolfSolver)" Date: Wed, 14 Aug 2024 16:57:16 +0200 Subject: [PATCH 1/7] Initial developement for NestedCategory with Retrocompatibility with old Cat:Sub. Global switch to activate new Nested Category management --- .../java/com/money/manager/ex/domainmodel/Category.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/src/main/java/com/money/manager/ex/domainmodel/Category.java b/app/src/main/java/com/money/manager/ex/domainmodel/Category.java index 3fc563a78c..e8497140a0 100644 --- a/app/src/main/java/com/money/manager/ex/domainmodel/Category.java +++ b/app/src/main/java/com/money/manager/ex/domainmodel/Category.java @@ -32,6 +32,8 @@ public class Category public static final String ACTIVE = "ACTIVE"; public static final String PARENTID = "PARENTID"; + public static final String BASENAME = "BASENAME"; + public Category() { super(); } @@ -63,4 +65,8 @@ public String getName() { public void setName(String value) { setString(CATEGNAME, value); } + + public String getBasename() { return getString(BASENAME);} + public void setBasename(String value) { setString(BASENAME, value);} + } From bd262690eef97d4d52f02aefbb2cf79469a6b197 Mon Sep 17 00:00:00 2001 From: "Emmanuele (WolfSolver)" Date: Wed, 14 Aug 2024 16:58:48 +0200 Subject: [PATCH 2/7] Initial developement for NestedCategory with Retrocompatibility with old Cat:Sub. Global switch to activate new Nested Category management --- app/src/main/res/values/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6a3ae7073c..565b6663e5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -438,8 +438,8 @@ Show notification for scheduled transaction overdue Auto execution for scheduled transaction overdue - Use new nested category model - Use new nested category model instead of category:subcategory model + (BETA) Use new nested category model + Use new nested category model instead of category:subcategory model. Use at own risc Tools Entities From b477d15ddf699c4032349ed06e6f0c6412206f53 Mon Sep 17 00:00:00 2001 From: "Emmanuele (WolfSolver)" Date: Wed, 28 Aug 2024 15:11:20 +0200 Subject: [PATCH 3/7] Update Site (missing link on badge) & ReadMe --- README.md | 9 ++++++--- docs/index.html | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index dbb7657fa4..282f1766e3 100644 --- a/README.md +++ b/README.md @@ -7,14 +7,17 @@ See our homepage at [android.moneymanagerex.org](http://android.moneymanagerex.o Money Manager Ex for Android is a mobile companion to PC/desktop personal finance applications currently available for Windows, Mac OSX and LINUX. It can be used with the same database used by MoneyManagerEx Desktop, or as an addition to GnuCash or other applications that import transactions via .qif files. #### Download -[Get it on F-Droid](https://f-droid.org/packages/com.money.manager.ex) -[Get it on GitHub](https://github.com/moneymanagerex/android-money-manager-ex/releases/latest) + +* [Get it on F-Droid](https://f-droid.org/packages/com.money.manager.ex) ![F-Droid Version](https://img.shields.io/f-droid/v/com.money.manager.ex) + +* [Get it on GitHub](https://github.com/moneymanagerex/android-money-manager-ex/releases/latest) ![GitHub Release](https://img.shields.io/github/v/release/moneymanagerex/android-money-manager-ex) + ##### Nightly build [![Build status](https://ci.appveyor.com/api/projects/status/bn231orqqh7bi6um?svg=true)](https://ci.appveyor.com/project/moneymanagerex/android-money-manager-ex) #### Documentation -- [UserManual](docs/usermanual/index.md) +- [UserManual](docs/usermanual/index.md)x - [neested category](doc/nestedcategory.md) diff --git a/docs/index.html b/docs/index.html index 156a02cf04..3a861d26de 100644 --- a/docs/index.html +++ b/docs/index.html @@ -161,8 +161,8 @@

- Get it on F-Droid - Get it on GitHub + Get it on F-Droid + Get it on GitHub


Detail manual installation istruction here. From 00202f5fa131de522cb529c92130cc757b952ecf Mon Sep 17 00:00:00 2001 From: "Emmanuele (WolfSolver)" Date: Wed, 28 Aug 2024 15:13:22 +0200 Subject: [PATCH 4/7] Update Site (missing link on badge) & ReadMe --- README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 282f1766e3..40f675f624 100644 --- a/README.md +++ b/README.md @@ -7,10 +7,8 @@ See our homepage at [android.moneymanagerex.org](http://android.moneymanagerex.o Money Manager Ex for Android is a mobile companion to PC/desktop personal finance applications currently available for Windows, Mac OSX and LINUX. It can be used with the same database used by MoneyManagerEx Desktop, or as an addition to GnuCash or other applications that import transactions via .qif files. #### Download - -* [Get it on F-Droid](https://f-droid.org/packages/com.money.manager.ex) ![F-Droid Version](https://img.shields.io/f-droid/v/com.money.manager.ex) - -* [Get it on GitHub](https://github.com/moneymanagerex/android-money-manager-ex/releases/latest) ![GitHub Release](https://img.shields.io/github/v/release/moneymanagerex/android-money-manager-ex) +[Get it on F-Droid](https://f-droid.org/packages/com.money.manager.ex) ![F-Droid Version](https://img.shields.io/f-droid/v/com.money.manager.ex) +[Get it on GitHub](https://github.com/moneymanagerex/android-money-manager-ex/releases/latest) ![GitHub Release](https://img.shields.io/github/v/release/moneymanagerex/android-money-manager-ex) ##### Nightly build From 6d061976ba57b9395cea29e47075f4b25645870e Mon Sep 17 00:00:00 2001 From: "Emmanuele (WolfSolver)" Date: Wed, 28 Aug 2024 15:13:45 +0200 Subject: [PATCH 5/7] Update Site (missing link on badge) & ReadMe --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 40f675f624..c1ed4b343e 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,7 @@ Money Manager Ex for Android is a mobile companion to PC/desktop personal financ #### Download [Get it on F-Droid](https://f-droid.org/packages/com.money.manager.ex) ![F-Droid Version](https://img.shields.io/f-droid/v/com.money.manager.ex) + [Get it on GitHub](https://github.com/moneymanagerex/android-money-manager-ex/releases/latest) ![GitHub Release](https://img.shields.io/github/v/release/moneymanagerex/android-money-manager-ex) From faae6c90b8bd185062429bd86ec717844017434a Mon Sep 17 00:00:00 2001 From: "Emmanuele (WolfSolver)" Date: Wed, 28 Aug 2024 15:16:39 +0200 Subject: [PATCH 6/7] fix merge error --- .../main/java/com/money/manager/ex/domainmodel/Category.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/src/main/java/com/money/manager/ex/domainmodel/Category.java b/app/src/main/java/com/money/manager/ex/domainmodel/Category.java index 4d2bd1cb4b..34fc1d10c5 100644 --- a/app/src/main/java/com/money/manager/ex/domainmodel/Category.java +++ b/app/src/main/java/com/money/manager/ex/domainmodel/Category.java @@ -33,8 +33,6 @@ public class Category public static final String PARENTID = "PARENTID"; public static final String BASENAME = "BASENAME"; - public static final String BASENAME = "BASENAME"; - public Category() { super(); } From 1b341ef837f05adf2283f7732983d294263f1709 Mon Sep 17 00:00:00 2001 From: "Emmanuele (WolfSolver)" Date: Wed, 28 Aug 2024 15:17:09 +0200 Subject: [PATCH 7/7] remove typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c1ed4b343e..e0677c6958 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Money Manager Ex for Android is a mobile companion to PC/desktop personal financ [![Build status](https://ci.appveyor.com/api/projects/status/bn231orqqh7bi6um?svg=true)](https://ci.appveyor.com/project/moneymanagerex/android-money-manager-ex) #### Documentation -- [UserManual](docs/usermanual/index.md)x +- [UserManual](docs/usermanual/index.md) - [neested category](doc/nestedcategory.md)