finished.

Author: gonultasmf

MyFinance/Controls/GeneralPopup.cs

@@ -2,7 +2,7 @@
 
 public partial class GeneralPopup : DXPopup
 {
-    public GeneralPopup(string title, string desc, string okBtnTxt = "OK", PopupType pType = PopupType.Info, bool allowScrim = false)
+    public GeneralPopup(string title, string desc, string okBtnTxt = "OK", PopupType pType = PopupType.Info, bool allowScrim = false, string okBtnCommand = "OkBtnPopupCommand")
     {
         var color = pType == PopupType.Info ? SkyBlue : pType == PopupType.Warning ? DarkOrange : Red;
 
@@ -58,6 +58,7 @@ public GeneralPopup(string title, string desc, string okBtnTxt = "OK", PopupType
                         .BackgroundColor(DeepSkyBlue)
                         .CenterHorizontal()
                         .Padding(0)
+                        .Command(e => e.Path(okBtnCommand))
                         .OnClicked((sender, e) =>
                         {
                             IsOpen = false;

MyFinance/ViewModels/AddOrEditPageViewModel.cs

@@ -17,6 +17,7 @@ public partial class AddOrEditPageViewModel : BaseViewModel
     public AddOrEditPageViewModel(IOperationItemsRepo operationItemsRepo)
     {
         _operationItemsRepo = operationItemsRepo;
+        OperationItem.Date = (OperationItem.Id == Guid.Empty ? DateTime.Now : OperationItem.Date);
     }
 
     [RelayCommand]
@@ -43,7 +44,6 @@ await _operationItemsRepo.InsertAsync(OperationItem) :
         if (result)
         {
             IsInfoPopupShow = true;
-            await AppShell.Current.GoToAsync($"//{nameof(ItemsPage)}");
         }
         else
         {
@@ -55,6 +55,8 @@ await _operationItemsRepo.InsertAsync(OperationItem) :
     public async Task Cancel()
     {
         await AppShell.Current.GoToAsync($"//{nameof(ItemsPage)}");
+
+        OperationItem = new();
     }
 
     [RelayCommand]
@@ -65,6 +67,6 @@ public async Task Loading()
             OperationItem = await _operationItemsRepo.GetSingleAsync(e => e.Id == Id);
         }
         else
-            OperationItem.Date = OperationItem.Id == Guid.Empty ? DateTime.Now : OperationItem.Date;
+            OperationItem.Date = (OperationItem.Id == Guid.Empty ? DateTime.Now : OperationItem.Date);
     }
 }

MyFinance/ViewModels/ItemsPageViewModel.cs

@@ -35,7 +35,7 @@ public partial class ItemsPageViewModel : BaseViewModel
     [ObservableProperty]
     private Guid deleteId;
 
-    private int index = 15;
+    private int index = 0;
 
     public ItemsPageViewModel(IOperationItemsRepo operationItemsRepo, IMapper mapper)
     {
@@ -107,18 +107,9 @@ public void ShowFilterPopup()
     }
 
     [RelayCommand]
-    public async void ShowItem()
+    public async void GotoAddPage(object parameter)
     {
         await AppShell.Current.GoToAsync($"//{nameof(AddOrEditPage)}");
-        await GetItems(GetDate());
-    }
-
-    [RelayCommand]
-    public async void GotoEditPage(object parameter)
-    {
-        //AddOrEditPageViewModel.Id = true;
-        await AppShell.Current.GoToAsync($"//{nameof(AddOrEditPage)}");
-        await GetItems(GetDate());
     }
 
     [RelayCommand]
@@ -133,7 +124,7 @@ public async Task Yes()
     {
         var result = await _operationItemsRepo.RemoveAsync(DeleteId);
         IsLoadingItems = true;
-        await GetItems(GetDate());
+        Items = await GetItems(GetDate());
         IsDeletePopupShow = false;
         await Task.Delay(1500);
 

MyFinance/Views/AddOrEditPage.cs

@@ -27,6 +27,7 @@ public override void Build()
                 new DateEdit()
                 .Assign(out var dateEdit)
                 .LabelText("Tarih")
+                .Date(e => e.Path("OperationItem.Date"))
                 .PickerButtonAreaTemplate(() => 
                     new HorizontalStackLayout()
                     .Margin(10)
@@ -47,8 +48,7 @@ public override void Build()
                         .Text("OK")
                         .Command(e => e.Path("ConfirmCommand"))
                     )
-                )
-                .Date(e => e.Path("OperationItem.Date")),
+                ),
 
                 new TextEdit()
                 .LabelText("Para Tutarı")
@@ -74,7 +74,7 @@ public override void Build()
                 .FontSize(15)
                 .Command(e => e.Path("CancelCommand")),
 
-                new GeneralPopup("BİLGİ", "İşlem başarılı oldu. ", "OK", PopupType.Info)
+                new GeneralPopup("BİLGİ", "İşlem başarılı oldu. ", "OK", PopupType.Info, okBtnCommand: "CancelCommand")
                 .RowSpan(4)
                 .IsOpen(e => e.Path("IsInfoPopupShow")),
 

MyFinance/Views/ItemsPage.cs

@@ -29,7 +29,7 @@ public override void Build()
                     new ImageButton()
                     .Source("wallet.png")
                     .SizeRequest(40, 40)
-                    .Command(e => e.Path("ShowItemCommand"))
+                    .Command(e => e.Path("GotoAddPageCommand"))
                     .Column(1),
 
                     new ImageButton()
@@ -80,11 +80,7 @@ public override void Build()
                                 {
                                     AddOrEditPageViewModel.Id = ((OperationItemsVM)e.Item).Id;
                                     await AppShell.Current.GoToAsync($"//{nameof(AddOrEditPage)}");
-                                    //BindingContext.ApplyFilterCommand.Execute(null);
                                 })
-                                //.CommandParameter(e => e.Path(nameof(DXCollectionView.SelectedItem)).Source(collectionView))
-                            //.FontColor(Orange)
-                            //.Image("edit.png")
                             )
                             .EndSwipeItems(
                                 new SwipeItem()
@@ -98,7 +94,6 @@ public override void Build()
                                     BindingContext.DeleteId = ((OperationItemsVM)e.Item).Id;
                                     BindingContext.IsDeletePopupShow = true;
                                 })
-                                //.Image("home.png")
                             )
                             .ItemView(
                                 new DXStackLayout()
@@ -311,4 +306,11 @@ public override void Build()
             )
         );
     }
+
+    protected override void OnAppearing()
+    {
+        base.OnAppearing();
+
+        BindingContext.ApplyFilterCommand.Execute(null);
+    }
 }