Commit Graph

73 Commits

Author SHA1 Message Date
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
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
Florian
ae1759e149 Merge remote-tracking branch 'origin/main' into Florian
# Conflicts:
#	Ledger/app/src/main/java/at/xaxa/ledger/ui/LedgerUI.kt
2025-01-15 18:35:19 +01:00
Florian
4f65e88b63 jjdjdj 2025-01-15 18:34:24 +01:00
Florian
c508f080d3 .asdd 2025-01-15 18:25:56 +01:00
Xaver
4dbeeda782 icons in list and reformatting 2025-01-15 18:12:56 +01:00
Xaver
c65b271f9c Merge remote-tracking branch 'origin/Florian'
# Conflicts:
#	Ledger/app/src/main/java/at/xaxa/ledger/ui/LedgerUI.kt
#	Ledger/app/src/main/java/at/xaxa/ledger/ui/category/add/AddCategoryUI.kt
2025-01-15 17:59:11 +01:00
Xaver
54de695413 changed Category listings 2025-01-15 17:55:47 +01:00
Florian
2380134f8b AddCategory Working but Still no Icons :/ 2025-01-15 17:51:42 +01:00
Florian
359a67e560 Icon List added for Category 2025-01-15 17:11:33 +01:00
Xaver
67fc41940f Merge remote-tracking branch 'origin/Florian' 2025-01-15 16:36:10 +01:00
Florian
63083c6cab CategoryUI scuffed 2025-01-15 16:34:04 +01:00
Xaver
013732322a Merge remote-tracking branch 'origin/Florian' 2025-01-15 15:51:25 +01:00
Florian
adcd8bb3a0 CategoryUI updated 2025-01-15 15:26:52 +01:00
Xaver
9dd29feb67 fixed categories not loading 2025-01-15 14:58:40 +01:00
Florian
b32cfe1844 Merge remote-tracking branch 'origin/main' into Florian
# Conflicts:
#	Ledger/app/src/main/java/at/xaxa/ledger/ui/edit/EditUI.kt
#	Ledger/app/src/main/java/at/xaxa/ledger/ui/edit/EditViewModel.kt
2025-01-15 14:54:07 +01:00
Florian
f585e0c01c addCategory added and semifunctional 2025-01-15 14:52:42 +01:00
Xaver
cd2337722a Edit Screen Func done 2025-01-15 14:50:08 +01:00
Florian
6e17aff90d Merge remote-tracking branch 'origin/Xaver' into Florian 2025-01-15 10:49:13 +01:00
Florian
f246d2efbb .. 2025-01-15 10:48:36 +01:00
Xaver
80a8c8cb06 push me 2025-01-15 10:48:29 +01:00
Xaver
29c3dce90c Merge remote-tracking branch 'origin/Florian' 2025-01-15 10:07:20 +01:00
Florian
e3bc4f6b74 findCategoryByID in EditVM 2025-01-15 10:06:49 +01:00
Xaver
bcf0b9435a . 2025-01-15 09:54:40 +01:00
Xaver
d299f54a1e Merge remote-tracking branch 'origin/Florian'
# Conflicts:
#	Ledger/app/src/main/java/at/xaxa/ledger/ui/edit/EditUI.kt
#	Ledger/app/src/main/java/at/xaxa/ledger/ui/edit/EditViewModel.kt
2025-01-15 09:51:44 +01:00
Xaver
8f44d99788 . 2025-01-15 09:49:25 +01:00
Florian
3ca097a804 Added CategoryUI and ViewModel 2025-01-15 09:48:49 +01:00
Xaver
bb30679348 edit screen ui 2025-01-14 16:14:59 +01:00
Florian
3ea6ef626e Add completely functional. Home mostly working 2025-01-14 15:46:49 +01:00
Florian
b0511a0596 Merge remote-tracking branch 'origin/main' into Florian
# Conflicts:
#	Ledger/app/src/main/java/at/xaxa/ledger/ui/add/AddUI.kt
2025-01-14 15:33:21 +01:00
Florian
d22ebcd162 . 2025-01-14 15:32:48 +01:00
Florian
a3cb3bfa7c Merge remote-tracking branch 'origin/main' into Florian
# Conflicts:
#	Ledger/app/src/main/java/at/xaxa/ledger/ui/add/AddUI.kt
2025-01-14 15:32:16 +01:00
Xaver
e07b2084f8 updates datepicker 2025-01-14 15:30:40 +01:00
Xaver
b9649a6fab EditUi 2025-01-14 15:16:37 +01:00
Florian
29fe4182be Connection between AddUI and AddViewmodel?!?!? 2025-01-14 14:31:00 +01:00
Xaver
aef7c9cd6f AddUi done 2025-01-14 14:14:21 +01:00
Florian
df8fae5eec Merge remote-tracking branch 'origin/main' into Florian 2025-01-14 13:41:33 +01:00
Florian
f748d657eb AddViewModel updated 2025-01-14 13:40:49 +01:00
Xaver
0ac75cb6d2 add ui 2025-01-14 13:40:38 +01:00
Xaver
1d025b4947 Merge remote-tracking branch 'origin/Florian' 2025-01-14 11:25:52 +01:00
Xaver
ec6a6e341b navigate to add 2025-01-14 11:25:11 +01:00
Florian
4e414be7fb AddViewModel 2025-01-14 11:24:14 +01:00
Xaver
5d72d47c8b stuff 2025-01-14 10:35:43 +01:00
Xaver
9845a7fd75 Merge remote-tracking branch 'origin/Florian'
# Conflicts:
#	Ledger/app/src/main/java/at/xaxa/ledger/ui/home/HomeUI.kt
2025-01-14 10:33:15 +01:00