Reorganize interfaces to sub-folder and platform common folder

justcoding121 · justcoding121 · commit 378c462620bf · 2025-11-19T20:34:52.000-06:00
diff --git a/src/Bible.Alarm/App.xaml.cs b/src/Bible.Alarm/App.xaml.cs
@@ -1,5 +1,6 @@
-﻿using Bible.Alarm.Common.Interfaces.Media;
-using Bible.Alarm.Common.Interfaces.UI;
+﻿using Bible.Alarm.Common.Interfaces.UI;
+using Bible.Alarm.Services.Media.Interfaces;
+using Bible.Alarm.Services.UI.Interfaces;
 using Bible.Alarm.Common.Messenger;
 using Bible.Alarm.Services.Media;
 using Bible.Alarm.ViewModels;
diff --git a/src/Bible.Alarm/MauiProgram.cs b/src/Bible.Alarm/MauiProgram.cs
@@ -3,20 +3,22 @@
 
 using Bible.Alarm.Common.Interfaces.Battery;
 using Bible.Alarm.Common.Interfaces.Media;
-using Bible.Alarm.Common.Interfaces.Network;
 using Bible.Alarm.Common.Interfaces.Platform;
-using Bible.Alarm.Common.Interfaces.Scheduler;
 using Bible.Alarm.Common.Interfaces.Storage;
 using Bible.Alarm.Common.Interfaces.UI;
+using Bible.Alarm.Services.Battery.Interfaces;
+using Bible.Alarm.Services.Media.Interfaces;
+using Bible.Alarm.Services.Network.Interfaces;
+using Bible.Alarm.Services.Scheduler.Interfaces;
+using Bible.Alarm.Services.UI.Interfaces;
 using Bible.Alarm.Database;
 using Bible.Alarm.Models.Schedule;
 using Bible.Alarm.Services.Battery;
 using Bible.Alarm.Services.Database;
+using Bible.Alarm.Services.Database.Interfaces;
 using Bible.Alarm.Services.Media;
-using Bible.Alarm.Services.Media.Interfaces;
 using Bible.Alarm.Services.Network;
 using Bible.Alarm.Services.Scheduler;
-using Bible.Alarm.Services.Scheduler.Interfaces;
 using Bible.Alarm.Services.UI;
 using Bible.Alarm.Common;
 using Bible.Alarm.Shared.Constants;
diff --git a/src/Bible.Alarm/Platforms/Android/Services/Handlers/AndroidAlarmHandler.cs b/src/Bible.Alarm/Platforms/Android/Services/Handlers/AndroidAlarmHandler.cs
@@ -1,4 +1,5 @@
 using Bible.Alarm.Common.Interfaces.Media;
+using Bible.Alarm.Services.Media.Interfaces;
 using Bible.Alarm.Database;
 using Bible.Alarm.Platforms.Android.Services.UI;
 using Microsoft.EntityFrameworkCore;
diff --git a/src/Bible.Alarm/Platforms/Windows/Services/Handlers/WindowsAlarmHandler.cs b/src/Bible.Alarm/Platforms/Windows/Services/Handlers/WindowsAlarmHandler.cs
@@ -1,4 +1,5 @@
 using Bible.Alarm.Common.Interfaces.Media;
+using Bible.Alarm.Services.Media.Interfaces;
 using Serilog;
 
 namespace Bible.Alarm.Platforms.Windows.Services.Handlers
diff --git a/src/Bible.Alarm/Platforms/iOS/Services/Handlers/iOSAlarmHandler.cs b/src/Bible.Alarm/Platforms/iOS/Services/Handlers/iOSAlarmHandler.cs
@@ -1,4 +1,5 @@
 using Bible.Alarm.Common.Interfaces.Media;
+using Bible.Alarm.Services.Media.Interfaces;
 using Serilog;
 using UIKit;
 
diff --git a/src/Bible.Alarm/Platforms/iOS/Services/Media/PreviewPlayService.cs b/src/Bible.Alarm/Platforms/iOS/Services/Media/PreviewPlayService.cs
@@ -1,5 +1,6 @@
 using AVFoundation;
 using Bible.Alarm.Common.Interfaces.Media;
+using Bible.Alarm.Services.Media.Interfaces;
 using Foundation;
 
 namespace Bible.Alarm.Platforms.iOS.Services.Media
diff --git a/src/Bible.Alarm/Services/Battery/BatteryOptimizationService.cs b/src/Bible.Alarm/Services/Battery/BatteryOptimizationService.cs
@@ -1,4 +1,5 @@
 using Bible.Alarm.Common.Interfaces.Battery;
+using Bible.Alarm.Services.Battery.Interfaces;
 using Bible.Alarm.Database;
 using Bible.Alarm.Models;
 using Microsoft.EntityFrameworkCore;
diff --git a/src/Bible.Alarm/Services/Battery/Interfaces/IBatteryOptimizationService.cs b/src/Bible.Alarm/Services/Battery/Interfaces/IBatteryOptimizationService.cs
@@ -1,4 +1,4 @@
-namespace Bible.Alarm.Common.Interfaces.Battery;
+namespace Bible.Alarm.Services.Battery.Interfaces;
 
 public interface IBatteryOptimizationService
 {
diff --git a/src/Bible.Alarm/Services/Database/DatabaseSeedService.cs b/src/Bible.Alarm/Services/Database/DatabaseSeedService.cs
@@ -1,6 +1,7 @@
 using Bible.Alarm.Database;
 using Bible.Alarm.Models;
 using Bible.Alarm.Models.Schedule;
+using Bible.Alarm.Services.Database.Interfaces;
 using Bible.Alarm.Shared.Constants;
 using Bible.Alarm.Shared.Database;
 using Microsoft.EntityFrameworkCore;
diff --git a/src/Bible.Alarm/Services/Database/Interfaces/IDatabaseSeedService.cs b/src/Bible.Alarm/Services/Database/Interfaces/IDatabaseSeedService.cs
@@ -1,4 +1,4 @@
-namespace Bible.Alarm.Services.Database;
+namespace Bible.Alarm.Services.Database.Interfaces;
 
 public interface IDatabaseSeedService
 {
diff --git a/src/Bible.Alarm/Services/Database/Interfaces/IScheduleMigrationService.cs b/src/Bible.Alarm/Services/Database/Interfaces/IScheduleMigrationService.cs
@@ -1,4 +1,4 @@
-namespace Bible.Alarm.Services.Database;
+namespace Bible.Alarm.Services.Database.Interfaces;
 
 public interface IScheduleMigrationService
 {
diff --git a/src/Bible.Alarm/Services/Database/ScheduleMigrationService.cs b/src/Bible.Alarm/Services/Database/ScheduleMigrationService.cs
@@ -1,4 +1,5 @@
 using Bible.Alarm.Database;
+using Bible.Alarm.Services.Database.Interfaces;
 using Bible.Alarm.Shared.Helpers;
 using Microsoft.EntityFrameworkCore;
 using Serilog;
diff --git a/src/Bible.Alarm/Services/Media/BibleNavigationService.cs b/src/Bible.Alarm/Services/Media/BibleNavigationService.cs
@@ -1,4 +1,4 @@
-using Bible.Alarm.Common.Interfaces.Media;
+using Bible.Alarm.Services.Media.Interfaces;
 using Bible.Alarm.Models.Schedule;
 using Serilog;
 
diff --git a/src/Bible.Alarm/Services/Media/DownloadService.cs b/src/Bible.Alarm/Services/Media/DownloadService.cs
@@ -1,5 +1,5 @@
 using System.Net;
-using Bible.Alarm.Common.Interfaces.Media;
+using Bible.Alarm.Services.Media.Interfaces;
 using Bible.Alarm.Shared.Constants;
 using Polly;
 using Polly.Retry;
diff --git a/src/Bible.Alarm/Services/Media/Interfaces/IBibleNavigationService.cs b/src/Bible.Alarm/Services/Media/Interfaces/IBibleNavigationService.cs
@@ -1,6 +1,6 @@
 using Bible.Alarm.Models.Schedule;
 
-namespace Bible.Alarm.Common.Interfaces.Media;
+namespace Bible.Alarm.Services.Media.Interfaces;
 
 public interface IBibleNavigationService
 {
diff --git a/src/Bible.Alarm/Services/Media/Interfaces/IDownloadService.cs b/src/Bible.Alarm/Services/Media/Interfaces/IDownloadService.cs
@@ -1,7 +1,8 @@
-﻿namespace Bible.Alarm.Common.Interfaces.Media;
+namespace Bible.Alarm.Services.Media.Interfaces;
 
 public interface IDownloadService : IDisposable
 {
     Task<byte[]> DownloadAsync(string url, string alternativeUrl = null);
     Task<bool> FileExists(string url);
-}
+}
+
diff --git a/src/Bible.Alarm/Services/Media/Interfaces/IMediaCacheService.cs b/src/Bible.Alarm/Services/Media/Interfaces/IMediaCacheService.cs
@@ -1,4 +1,4 @@
-﻿namespace Bible.Alarm.Common.Interfaces.Media;
+namespace Bible.Alarm.Services.Media.Interfaces;
 
 public interface IMediaCacheService : IDisposable
 {
@@ -13,4 +13,5 @@ public interface IMediaCacheService : IDisposable
 
     Task<string> GetBibleChapterUrl(string languageCode, string pubCode, int bookNumber, int chapter,
         string lookUpPath);
-}
+}
+
diff --git a/src/Bible.Alarm/Services/Media/Interfaces/IMediaCacheSetupService.cs b/src/Bible.Alarm/Services/Media/Interfaces/IMediaCacheSetupService.cs
@@ -1,4 +1,4 @@
-namespace Bible.Alarm.Common.Interfaces.Media;
+namespace Bible.Alarm.Services.Media.Interfaces;
 
 public interface IMediaCacheSetupService
 {
diff --git a/src/Bible.Alarm/Services/Media/Interfaces/IMediaElementAudioService.cs b/src/Bible.Alarm/Services/Media/Interfaces/IMediaElementAudioService.cs
@@ -1,4 +1,4 @@
-namespace Bible.Alarm.Common.Interfaces.Media;
+namespace Bible.Alarm.Services.Media.Interfaces;
 
 public interface IMediaElementAudioService
 {
@@ -17,4 +17,5 @@ public interface IMediaElementAudioService
     Task Stop();
     Task SeekTo(TimeSpan position);
     void Dispose();
-}
+}
+
diff --git a/src/Bible.Alarm/Services/Media/Interfaces/IPlaybackService.cs b/src/Bible.Alarm/Services/Media/Interfaces/IPlaybackService.cs
@@ -1,4 +1,4 @@
-﻿namespace Bible.Alarm.Common.Interfaces.Media;
+namespace Bible.Alarm.Services.Media.Interfaces;
 
 public interface IPlaybackService
 {
@@ -16,4 +16,5 @@ public interface IPlaybackService
 
     Task PrepareAndPlay(int scheduleId, bool isImmediate);
     Task Dismiss();
-}
+}
+
diff --git a/src/Bible.Alarm/Services/Media/Interfaces/IPlaylistService.cs b/src/Bible.Alarm/Services/Media/Interfaces/IPlaylistService.cs
@@ -1,7 +1,7 @@
-﻿using Bible.Alarm.Shared.Models.Media;
+using Bible.Alarm.Shared.Models.Media;
 using Bible.Alarm.Shared.Models.Media.Bible;
 
-namespace Bible.Alarm.Common.Interfaces.Media;
+namespace Bible.Alarm.Services.Media.Interfaces;
 
 public interface IPlaylistService : IDisposable
 {
@@ -26,4 +26,5 @@ Task<KeyValuePair<BibleBook, BibleChapter>> GetPreviousBibleChapter(string langu
         GetPreviousBibleBook(string languageCode, string publicationCode, int bookNumber);
 
     Task<KeyValuePair<int, BibleBook>> GetNextBibleBook(string languageCode, string publicationCode, int bookNumber);
-}
+}
+
diff --git a/src/Bible.Alarm/Services/Media/Interfaces/IScheduleDisplayService.cs b/src/Bible.Alarm/Services/Media/Interfaces/IScheduleDisplayService.cs
@@ -1,6 +1,6 @@
 using Bible.Alarm.Models.Schedule;
 
-namespace Bible.Alarm.Common.Interfaces.Media;
+namespace Bible.Alarm.Services.Media.Interfaces;
 
 public interface IScheduleDisplayService
 {
diff --git a/src/Bible.Alarm/Services/Media/Interfaces/ISchedulePlaybackService.cs b/src/Bible.Alarm/Services/Media/Interfaces/ISchedulePlaybackService.cs
@@ -1,4 +1,4 @@
-namespace Bible.Alarm.Common.Interfaces.Media;
+namespace Bible.Alarm.Services.Media.Interfaces;
 
 public interface ISchedulePlaybackService
 {
diff --git a/src/Bible.Alarm/Services/Media/MediaCacheService.cs b/src/Bible.Alarm/Services/Media/MediaCacheService.cs
@@ -1,8 +1,8 @@
 using System.Collections.Concurrent;
 using System.Text;
-using Bible.Alarm.Common.Interfaces.Media;
-using Bible.Alarm.Common.Interfaces.Network;
 using Bible.Alarm.Common.Interfaces.Storage;
+using Bible.Alarm.Services.Media.Interfaces;
+using Bible.Alarm.Services.Network.Interfaces;
 using Bible.Alarm.Database;
 using Bible.Alarm.Shared.Constants;
 using Bible.Alarm.Shared.Helpers;
diff --git a/src/Bible.Alarm/Services/Media/MediaCacheSetupService.cs b/src/Bible.Alarm/Services/Media/MediaCacheSetupService.cs
@@ -1,4 +1,4 @@
-using Bible.Alarm.Common.Interfaces.Media;
+using Bible.Alarm.Services.Media.Interfaces;
 using Serilog;
 
 namespace Bible.Alarm.Services.Media;
diff --git a/src/Bible.Alarm/Services/Media/MediaElementAudioService.cs b/src/Bible.Alarm/Services/Media/MediaElementAudioService.cs
@@ -1,5 +1,5 @@
-using Bible.Alarm.Common.Interfaces.Media;
-using Bible.Alarm.Common.Interfaces.UI;
+using Bible.Alarm.Services.Media.Interfaces;
+using Bible.Alarm.Services.UI.Interfaces;
 using CommunityToolkit.Maui.Views;
 using Serilog;
 
diff --git a/src/Bible.Alarm/Services/Media/MediaIndexService.cs b/src/Bible.Alarm/Services/Media/MediaIndexService.cs
@@ -1,5 +1,4 @@
 using System.IO.Compression;
-using Bible.Alarm.Common.Interfaces.Media;
 using Bible.Alarm.Common.Interfaces.Platform;
 using Bible.Alarm.Common.Interfaces.Storage;
 using Bible.Alarm.Services.Media.Interfaces;
diff --git a/src/Bible.Alarm/Services/Media/PlaybackService.cs b/src/Bible.Alarm/Services/Media/PlaybackService.cs
@@ -1,6 +1,6 @@
-using Bible.Alarm.Common.Interfaces.Media;
-using Bible.Alarm.Common.Interfaces.Network;
 using Bible.Alarm.Common.Interfaces.Storage;
+using Bible.Alarm.Services.Media.Interfaces;
+using Bible.Alarm.Services.Network.Interfaces;
 using Bible.Alarm.Common.Messenger;
 using Bible.Alarm.Shared.Models.Media;
 using CommunityToolkit.Mvvm.Messaging;
diff --git a/src/Bible.Alarm/Services/Media/PlaylistService.cs b/src/Bible.Alarm/Services/Media/PlaylistService.cs
@@ -1,5 +1,5 @@
 using Bible.Alarm.Common;
-using Bible.Alarm.Common.Interfaces.Media;
+using Bible.Alarm.Services.Media.Interfaces;
 using Bible.Alarm.Common.Messenger;
 using Bible.Alarm.Database;
 using Bible.Alarm.Models;
diff --git a/src/Bible.Alarm/Services/Media/ScheduleDisplayService.cs b/src/Bible.Alarm/Services/Media/ScheduleDisplayService.cs
@@ -1,4 +1,4 @@
-using Bible.Alarm.Common.Interfaces.Media;
+using Bible.Alarm.Services.Media.Interfaces;
 using Bible.Alarm.Database;
 using Bible.Alarm.Models.Schedule;
 using Bible.Alarm.Shared.Database;
diff --git a/src/Bible.Alarm/Services/Media/SchedulePlaybackService.cs b/src/Bible.Alarm/Services/Media/SchedulePlaybackService.cs
@@ -1,5 +1,6 @@
-using Bible.Alarm.Common.Interfaces.Media;
 using Bible.Alarm.Common.Interfaces.UI;
+using Bible.Alarm.Services.Media.Interfaces;
+using Bible.Alarm.Services.UI.Interfaces;
 using Serilog;
 
 namespace Bible.Alarm.Services.Media;
diff --git a/src/Bible.Alarm/Services/Network/Interfaces/INetworkStatusService.cs b/src/Bible.Alarm/Services/Network/Interfaces/INetworkStatusService.cs
@@ -1,6 +1,7 @@
-﻿namespace Bible.Alarm.Common.Interfaces.Network;
+namespace Bible.Alarm.Services.Network.Interfaces;
 
 public interface INetworkStatusService : IDisposable
 {
     Task<bool> IsInternetAvailable();
-}
+}
+
diff --git a/src/Bible.Alarm/Services/Network/NetworkStatusService.cs b/src/Bible.Alarm/Services/Network/NetworkStatusService.cs
@@ -1,4 +1,4 @@
-using Bible.Alarm.Common.Interfaces.Network;
+using Bible.Alarm.Services.Network.Interfaces;
 
 namespace Bible.Alarm.Services.Network;
 
diff --git a/src/Bible.Alarm/Services/Scheduler/AlarmService.cs b/src/Bible.Alarm/Services/Scheduler/AlarmService.cs
@@ -1,5 +1,6 @@
-using Bible.Alarm.Common.Interfaces.Scheduler;
 using Bible.Alarm.Common.Interfaces.UI;
+using Bible.Alarm.Services.Scheduler.Interfaces;
+using Bible.Alarm.Services.UI.Interfaces;
 using Bible.Alarm.Models.Schedule;
 
 namespace Bible.Alarm.Services.Scheduler;
diff --git a/src/Bible.Alarm/Services/Scheduler/Interfaces/IAlarmService.cs b/src/Bible.Alarm/Services/Scheduler/Interfaces/IAlarmService.cs
@@ -1,10 +1,11 @@
-﻿using Bible.Alarm.Models.Schedule;
+using Bible.Alarm.Models.Schedule;
 
-namespace Bible.Alarm.Common.Interfaces.Scheduler;
+namespace Bible.Alarm.Services.Scheduler.Interfaces;
 
 public interface IAlarmService : IDisposable
 {
     Task Create(AlarmSchedule schedule);
     void Update(AlarmSchedule schedule);
     void Delete(int scheduleId);
-}
+}
+
diff --git a/src/Bible.Alarm/Services/Scheduler/Interfaces/ISchedulePersistenceService.cs b/src/Bible.Alarm/Services/Scheduler/Interfaces/ISchedulePersistenceService.cs
@@ -1,6 +1,6 @@
 using Bible.Alarm.Models.Schedule;
 
-namespace Bible.Alarm.Common.Interfaces.Scheduler;
+namespace Bible.Alarm.Services.Scheduler.Interfaces;
 
 public interface ISchedulePersistenceService
 {
diff --git a/src/Bible.Alarm/Services/Scheduler/Interfaces/IScheduleSelectionService.cs b/src/Bible.Alarm/Services/Scheduler/Interfaces/IScheduleSelectionService.cs
@@ -1,6 +1,6 @@
 using Bible.Alarm.Models.Schedule;
 
-namespace Bible.Alarm.Common.Interfaces.Scheduler;
+namespace Bible.Alarm.Services.Scheduler.Interfaces;
 
 public interface IScheduleSelectionService
 {
diff --git a/src/Bible.Alarm/Services/Scheduler/Interfaces/IScheduleStateService.cs b/src/Bible.Alarm/Services/Scheduler/Interfaces/IScheduleStateService.cs
@@ -1,4 +1,4 @@
-namespace Bible.Alarm.Services.Scheduler;
+namespace Bible.Alarm.Services.Scheduler.Interfaces;
 
 public interface IScheduleStateService
 {
diff --git a/src/Bible.Alarm/Services/Scheduler/SchedulePersistenceService.cs b/src/Bible.Alarm/Services/Scheduler/SchedulePersistenceService.cs
@@ -1,5 +1,5 @@
 using Bible.Alarm.Common;
-using Bible.Alarm.Common.Interfaces.Scheduler;
+using Bible.Alarm.Services.Scheduler.Interfaces;
 using Bible.Alarm.Database;
 using Bible.Alarm.Models.Schedule;
 using Bible.Alarm.Shared.Database;
diff --git a/src/Bible.Alarm/Services/Scheduler/ScheduleSelectionService.cs b/src/Bible.Alarm/Services/Scheduler/ScheduleSelectionService.cs
@@ -1,4 +1,4 @@
-using Bible.Alarm.Common.Interfaces.Scheduler;
+using Bible.Alarm.Services.Scheduler.Interfaces;
 using Bible.Alarm.Database;
 using Bible.Alarm.Models.Schedule;
 using Microsoft.EntityFrameworkCore;
diff --git a/src/Bible.Alarm/Services/Scheduler/ScheduleStateService.cs b/src/Bible.Alarm/Services/Scheduler/ScheduleStateService.cs
@@ -1,6 +1,7 @@
 using Bible.Alarm.Common;
-using Bible.Alarm.Common.Interfaces.Scheduler;
 using Bible.Alarm.Common.Interfaces.UI;
+using Bible.Alarm.Services.Scheduler.Interfaces;
+using Bible.Alarm.Services.UI.Interfaces;
 using Bible.Alarm.Database;
 using Bible.Alarm.Models.Schedule;
 using Bible.Alarm.Stores.Actions.Schedule;
diff --git a/src/Bible.Alarm/Services/Scheduler/SchedulerService.cs b/src/Bible.Alarm/Services/Scheduler/SchedulerService.cs
@@ -1,9 +1,9 @@
-using Bible.Alarm.Common.Interfaces.Media;
-using Bible.Alarm.Common.Interfaces.Scheduler;
 using Bible.Alarm.Common.Interfaces.Storage;
 using Bible.Alarm.Common.Interfaces.UI;
-using Bible.Alarm.Database;
+using Bible.Alarm.Services.Media.Interfaces;
 using Bible.Alarm.Services.Scheduler.Interfaces;
+using Bible.Alarm.Services.UI.Interfaces;
+using Bible.Alarm.Database;
 using Microsoft.EntityFrameworkCore;
 using Serilog;
 
diff --git a/src/Bible.Alarm/Services/UI/Interfaces/INavigationService.cs b/src/Bible.Alarm/Services/UI/Interfaces/INavigationService.cs
@@ -1,6 +1,6 @@
 using CommunityToolkit.Maui.Views;
 
-namespace Bible.Alarm.Common.Interfaces.UI;
+namespace Bible.Alarm.Services.UI.Interfaces;
 
 public interface INavigationService
 {
diff --git a/src/Bible.Alarm/Services/UI/NavigationService.cs b/src/Bible.Alarm/Services/UI/NavigationService.cs
@@ -1,4 +1,4 @@
-using Bible.Alarm.Common.Interfaces.UI;
+using Bible.Alarm.Services.UI.Interfaces;
 using Bible.Alarm.ViewModels.Bible;
 using Bible.Alarm.ViewModels.Music;
 using Bible.Alarm.Views;
diff --git a/src/Bible.Alarm/Services/UI/ToastService.cs b/src/Bible.Alarm/Services/UI/ToastService.cs
@@ -1,4 +1,5 @@
 using Bible.Alarm.Common.Interfaces.UI;
+using Bible.Alarm.Services.UI.Interfaces;
 using Bible.Alarm.Models.Schedule;
 
 namespace Bible.Alarm.Services.UI;
diff --git a/src/Bible.Alarm/ViewModels/Bible/BibleSelectionViewModel.cs b/src/Bible.Alarm/ViewModels/Bible/BibleSelectionViewModel.cs
diff --git a/src/Bible.Alarm/ViewModels/Bible/BookSelectionViewModel.cs b/src/Bible.Alarm/ViewModels/Bible/BookSelectionViewModel.cs
diff --git a/src/Bible.Alarm/ViewModels/Bible/ChapterSelectionViewModel.cs b/src/Bible.Alarm/ViewModels/Bible/ChapterSelectionViewModel.cs
diff --git a/src/Bible.Alarm/ViewModels/HomeViewModel.cs b/src/Bible.Alarm/ViewModels/HomeViewModel.cs
diff --git a/src/Bible.Alarm/ViewModels/Interfaces/IListViewModel.cs b/src/Bible.Alarm/ViewModels/Interfaces/IListViewModel.cs
diff --git a/src/Bible.Alarm/ViewModels/Music/MusicSelectionViewModel.cs b/src/Bible.Alarm/ViewModels/Music/MusicSelectionViewModel.cs
diff --git a/src/Bible.Alarm/ViewModels/Music/SongBookSelectionViewModel.cs b/src/Bible.Alarm/ViewModels/Music/SongBookSelectionViewModel.cs
diff --git a/src/Bible.Alarm/ViewModels/Music/TrackSelectionViewModel.cs b/src/Bible.Alarm/ViewModels/Music/TrackSelectionViewModel.cs
diff --git a/src/Bible.Alarm/ViewModels/ScheduleListItem.cs b/src/Bible.Alarm/ViewModels/ScheduleListItem.cs
diff --git a/src/Bible.Alarm/ViewModels/ScheduleViewModel.cs b/src/Bible.Alarm/ViewModels/ScheduleViewModel.cs
diff --git a/src/Bible.Alarm/ViewModels/Shared/AlarmViewModal.cs b/src/Bible.Alarm/ViewModels/Shared/AlarmViewModal.cs
diff --git a/src/Bible.Alarm/Views/Shared/BibleLanguageModal.xaml.cs b/src/Bible.Alarm/Views/Shared/BibleLanguageModal.xaml.cs
diff --git a/src/Bible.Alarm/Views/Shared/MusicLanguageModal.xaml.cs b/src/Bible.Alarm/Views/Shared/MusicLanguageModal.xaml.cs

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using Bible.Alarm.Common.Interfaces.Media;`
	`2`	`+using Bible.Alarm.Services.Media.Interfaces;`
`2`	`3`	`using Bible.Alarm.Database;`
`3`	`4`	`using Bible.Alarm.Platforms.Android.Services.UI;`
`4`	`5`	`using Microsoft.EntityFrameworkCore;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using Bible.Alarm.Common.Interfaces.Battery;`
	`2`	`+using Bible.Alarm.Services.Battery.Interfaces;`
`2`	`3`	`using Bible.Alarm.Database;`
`3`	`4`	`using Bible.Alarm.Models;`
`4`	`5`	`using Microsoft.EntityFrameworkCore;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace Bible.Alarm.Common.Interfaces.Battery;`
	`1`	`+namespace Bible.Alarm.Services.Battery.Interfaces;`
`2`	`2`
`3`	`3`	`public interface IBatteryOptimizationService`
`4`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace Bible.Alarm.Services.Database;`
	`1`	`+namespace Bible.Alarm.Services.Database.Interfaces;`
`2`	`2`
`3`	`3`	`public interface IDatabaseSeedService`
`4`	`4`	`{`