Skip to content

Commit d9c476e

Browse files
authored
Merge pull request #17 from EnesEfeTokta/Develop
Develop
2 parents dcd5201 + 314cb3e commit d9c476e

File tree

60 files changed

+2876
-396
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+2876
-396
lines changed

FinTrack/App.xaml.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,15 @@
44
using FinTrackForWindows.Services.Accounts;
55
using FinTrackForWindows.Services.Api;
66
using FinTrackForWindows.Services.AppInNotifications;
7+
using FinTrackForWindows.Services.ApplySettings;
78
using FinTrackForWindows.Services.Budgets;
89
using FinTrackForWindows.Services.Camera;
910
using FinTrackForWindows.Services.Currencies;
1011
using FinTrackForWindows.Services.Debts;
12+
using FinTrackForWindows.Services.Dialog;
1113
using FinTrackForWindows.Services.Memberships;
1214
using FinTrackForWindows.Services.Reports;
15+
using FinTrackForWindows.Services.StoresRefresh;
1316
using FinTrackForWindows.Services.Transactions;
1417
using FinTrackForWindows.Services.Users;
1518
using FinTrackForWindows.ViewModels;
@@ -94,7 +97,10 @@ private void ConfigureServices(IServiceCollection services)
9497
services.AddSingleton<IReportStore, ReportStore>();
9598
services.AddSingleton<IUserStore, UserStore>();
9699

100+
services.AddSingleton<IApplySettingsService, ApplySettingsService>();
97101
services.AddTransient<ICameraService, CameraService>();
102+
services.AddSingleton<IDialogService, WpfDialogService>();
103+
services.AddSingleton<IStoresRefresh, StoresRefresh>();
98104

99105
services.AddSingleton<IAppInNotificationService, AppInNotificationService>();
100106
}

FinTrack/Dtos/CurrencyDtos/ChangeSummaryDto.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
{
33
public class ChangeSummaryDto
44
{
5+
// Günlük
6+
public decimal? DailyLow { get; set; }
7+
public decimal? DailyHigh { get; set; }
8+
59
// Değişim Miktarı
610
public decimal? DailyChangeValue { get; set; }
711
public decimal? WeeklyChangeValue { get; set; }

FinTrack/Dtos/SettingsDtos/ProfileSettingsDto.cs

Lines changed: 0 additions & 12 deletions
This file was deleted.

FinTrack/Dtos/SettingsDtos/ProfileSettingsUpdateDto.cs

Lines changed: 0 additions & 9 deletions
This file was deleted.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
namespace FinTrackForWindows.Dtos.SettingsDtos
2+
{
3+
public class UpdateProfilePictureDto
4+
{
5+
public string ProfilePictureUrl { get; set; } = string.Empty;
6+
}
7+
}
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
namespace FinTrackForWindows.Dtos.SettingsDtos
2+
{
3+
public class UpdateUserEmailDto
4+
{
5+
public string NewEmail { get; set; } = string.Empty;
6+
public string OtpCode { get; set; } = string.Empty;
7+
}
8+
}
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
namespace FinTrackForWindows.Dtos.SettingsDtos
2+
{
3+
public class UpdateUserNameDto
4+
{
5+
public string FirstName { get; set; } = string.Empty;
6+
public string LastName { get; set; } = string.Empty;
7+
}
8+
}
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
namespace FinTrackForWindows.Dtos.SettingsDtos
2+
{
3+
public class UpdateUserPasswordDto
4+
{
5+
public string CurrentPassword { get; set; } = string.Empty;
6+
public string NewPassword { get; set; } = string.Empty;
7+
}
8+
}

FinTrack/Dtos/SettingsDtos/UserAppSettingsDto.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ public class UserAppSettingsDto
77
public int Id { get; set; }
88
public AppearanceType Appearance { get; set; }
99
public BaseCurrencyType Currency { get; set; }
10+
public LanguageType Language { get; set; }
1011
public DateTime CreatedAtUtc { get; set; }
1112
public DateTime? UpdatedAtUtc { get; set; }
1213
}

FinTrack/Dtos/SettingsDtos/UserAppSettingsUpdateDto.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@ public class UserAppSettingsUpdateDto
66
{
77
public AppearanceType Appearance { get; set; }
88
public BaseCurrencyType Currency { get; set; }
9+
public LanguageType Language { get; set; }
910
}
1011
}

0 commit comments

Comments
 (0)