Commit Graph

115 Commits

Author SHA1 Message Date
Xaver
06fa75ecc0 xaver feedback 2025-01-22 13:30:25 +01:00
Xaver
46b5ab236c Merge remote-tracking branch 'origin/Florian' 2025-01-22 12:55:22 +01:00
Florian
9ae8e1d15e db Structure 2025-01-22 12:54:48 +01:00
Xaver
d4b52e9720 . 2025-01-22 12:51:11 +01:00
Xaver
5b9b538a9a report 2025-01-22 12:48:40 +01:00
Xaver
a1b030afdc fixed images 2025-01-22 12:37:50 +01:00
Xaver
797a7fecb0 . 2025-01-22 12:34:19 +01:00
Xaver
d3f11f4d12 . 2025-01-22 11:49:58 +01:00
Xaver
4b80a3a78a . 2025-01-22 11:49:31 +01:00
Xaver
21061a26bf . 2025-01-22 11:45:58 +01:00
Xaver
3cdb3a0ae7 . 2025-01-22 11:33:16 +01:00
Florian
0c9ad997d3 bug fixed🧢 2025-01-20 14:56:33 +01:00
Xaver
f720a7ba30 readme report 2025-01-20 13:21:19 +01:00
Xaver
09ff5c2016 fixed no error bug 2025-01-20 12:56:15 +01:00
Xaver
678ce92b5e , 2025-01-20 12:22:18 +01:00
Xaver
c799b0e8a8 . 2025-01-20 10:15:40 +01:00
Florian
69d36abcad Merge remote-tracking branch 'origin/main' 2025-01-20 10:13:40 +01:00
Florian
2da0e0ac40 Merge remote-tracking branch 'origin/Florian'
# Conflicts:
#	Ledger/app/src/main/java/at/xaxa/ledger/ui/category/add/AddCategoryUI.kt
#	Ledger/app/src/main/java/at/xaxa/ledger/ui/entry/add/AddUI.kt
#	Ledger/app/src/main/java/at/xaxa/ledger/ui/entry/edit/EditUI.kt
2025-01-20 10:13:26 +01:00
Xaver
8262569134 fixed redir 2025-01-20 10:11:45 +01:00
Xaver
2bb80953c8 icon when selecting 2025-01-20 09:40:50 +01:00
Florian
71f0c257d2 Limit name input lines 2025-01-20 09:31:23 +01:00
Florian
8fc52e576d Heading for Transaction and Category added 2025-01-20 09:08:44 +01:00
Xaver
0f271451ac readme 2025-01-17 15:55:38 +01:00
Xaver
2465d2c6ab readme 2025-01-17 15:37:34 +01:00
Xaver
b87db2d95d Merge remote-tracking branch 'origin/Florian' 2025-01-17 15:33:31 +01:00
Florian
c97e422928 BalanceCard clickable 2025-01-17 15:28:38 +01:00
Xaver
ef5392bb3a . 2025-01-17 15:21:10 +01:00
Florian
a7f51909cd Spending != Amount bug fixed 2025-01-17 11:33:31 +01:00
Xaver
097835de83 del cat fixed 2025-01-17 11:18:58 +01:00
Xaver
d4116b5a7f category on load shown 2025-01-17 10:15:00 +01:00
Florian
9f22ce84fd pushme (satisfaction) 2025-01-17 10:03:08 +01:00
Florian
f97adc39eb Merge remote-tracking branch 'origin/Xaver' into Florian
# Conflicts:
#	Ledger/app/src/main/java/at/xaxa/ledger/data/EntryRepository.kt
#	Ledger/app/src/main/java/at/xaxa/ledger/data/db/LedgerDao.kt
#	Ledger/app/src/main/java/at/xaxa/ledger/ui/category/edit/EditCategory.kt
#	Ledger/app/src/main/java/at/xaxa/ledger/ui/entry/add/AddUI.kt
#	Ledger/app/src/main/java/at/xaxa/ledger/ui/home/HomeUI.kt
#	Ledger/app/src/main/java/at/xaxa/ledger/ui/home/HomeViewModel.kt
2025-01-17 09:50:14 +01:00
Florian
de6dea515f AddRegex updated 2025-01-17 09:44:43 +01:00
Xaver
db33c08fab overview calc 2025-01-17 09:43:52 +01:00
Florian
b908de01ba Merge remote-tracking branch 'origin/Xaver' into Florian 2025-01-17 09:28:51 +01:00
Florian
908f3307e6 BigEntity added, HomeViewModel & UI updated 2025-01-17 09:28:17 +01:00
Xaver
7e66cdc30b adding works again 2025-01-16 15:55:52 +01:00
Xaver
a0860c85ba delete working 2025-01-16 15:16:12 +01:00
Xaver
6c9c2117fe Merge remote-tracking branch 'origin/Florian' into Xaver
# Conflicts:
#	Ledger/app/src/main/java/at/xaxa/ledger/ui/category/edit/EditCategory.kt
#	Ledger/app/src/main/java/at/xaxa/ledger/ui/entry/edit/EditUI.kt
2025-01-16 14:54:11 +01:00
Florian
0027631611 findEntryByCategoryId not working 2025-01-16 14:52:56 +01:00
Xaver
cbe06735b1 category strucutre 2025-01-16 12:16:45 +01:00
Xaver
d6ff6de339 category structure 2025-01-16 12:16:33 +01:00
Xaver
120a24bd3e ui 2025-01-16 12:02:22 +01:00
Florian
5a13a3ee41 Merge remote-tracking branch 'origin/Xaver' into Florian
# Conflicts:
#	Ledger/app/src/main/java/at/xaxa/ledger/ui/category/edit/EditCategory.kt
2025-01-16 11:07:21 +01:00
Florian
227cde8458 qwefghjk 2025-01-16 11:06:54 +01:00
Xaver
ac7e35d54f edit category list is updating but not display the right val on load 2025-01-16 11:05:16 +01:00
Xaver
7ec6dc64ae random unused code 2025-01-15 21:01:49 +01:00
Xaver
8b57b46546 Merge remote-tracking branch 'origin/Florian'
# Conflicts:
#	Ledger/app/src/main/java/at/xaxa/ledger/ui/AppViewModelProvider.kt
#	Ledger/app/src/main/java/at/xaxa/ledger/ui/category/edit/EditCategory.kt
2025-01-15 20:57:02 +01:00
Xaver
9f6fcc13d0 changed file structure, improved date picker 2025-01-15 20:56:04 +01:00
Florian
14d7eb6a0f editCategory almost works(Icon doesnt change) 2025-01-15 20:03:45 +01:00